freifunk/ffmap-backend
8
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #2 from NeoRaider/master

Browse source 
Ungetestet mit Python2...
This commit is contained in:
Nils Schneider 2012-06-03 08:04:42 -07:00
parent ea529b374e 2ce562af26
commit 894b79b107
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
nodedb.py
View file

@ -3,7 +3,18 @@ from node import Node
from link import Link from link import Link
from bs4 import BeautifulSoup from bs4 import BeautifulSoup
import urllib
# Python2/3 compatiblity hacks
try:
from urllib.request import urlopen
except ImportError:
from urllib import urlopen
try:
basestring
except NameError:
basestring = str
class NodeDB: class NodeDB:
def __init__(self): def __init__(self):
@ -125,7 +136,7 @@ class NodeDB:
def import_wikigps(self, url): def import_wikigps(self, url):
def fetch_wikitable(url): def fetch_wikitable(url):
f = urllib.urlopen(url) f = urlopen(url)
soup = BeautifulSoup(f) soup = BeautifulSoup(f)