use current python-ox api
This commit is contained in:
parent
d2859f10ef
commit
17bb6fb036
2 changed files with 4 additions and 4 deletions
|
@ -328,7 +328,7 @@ def parse_txt():
|
|||
|
||||
def read_url(url):
|
||||
print 'reading', url
|
||||
return ox.cache.readUrl(url) if CACHE else ox.net.readUrl(url)
|
||||
return ox.cache.read_url(url) if CACHE else ox.net.read_url(url)
|
||||
|
||||
def read_wikipedia_url(id):
|
||||
url = 'http://en.wikipedia.org/wiki/' + encode_wikipedia_id(id)
|
||||
|
|
|
@ -90,7 +90,7 @@ units = [
|
|||
'wb'
|
||||
]
|
||||
|
||||
txt = ox.cache.readUrlUnicode('http://unicode.org/Public/UNIDATA/NamesList.txt')
|
||||
txt = ox.cache.read_url('http://unicode.org/Public/UNIDATA/NamesList.txt', unicode=True)
|
||||
lines = txt.split('\n')
|
||||
length = len(lines)
|
||||
chars = {}
|
||||
|
|
Loading…
Reference in a new issue