Python3 compatiblity
This commit is contained in:
parent
ea529b374e
commit
2ce562af26
15
nodedb.py
15
nodedb.py
|
@ -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)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue