change api, getUrl -> readUrl
This commit is contained in:
parent
d14f13faaf
commit
8d14cf2291
2 changed files with 10 additions and 10 deletions
|
|
@ -46,7 +46,7 @@ def openUrl(url, data=None, headers=DEFAULT_HEADERS):
|
|||
req = urllib2.Request(url, data, headers)
|
||||
return urllib2.urlopen(req)
|
||||
|
||||
def getUrl(url, data=None, headers=DEFAULT_HEADERS, returnHeaders=False):
|
||||
def readUrl(url, data=None, headers=DEFAULT_HEADERS, returnHeaders=False):
|
||||
f = openUrl(url, data, headers)
|
||||
data = f.read()
|
||||
f.close()
|
||||
|
|
@ -57,8 +57,8 @@ def getUrl(url, data=None, headers=DEFAULT_HEADERS, returnHeaders=False):
|
|||
return dict(f.headers), data
|
||||
return data
|
||||
|
||||
def getUrlUnicode(url):
|
||||
data = getUrl(url)
|
||||
def readUrlUnicode(url):
|
||||
data = readUrl(url)
|
||||
encoding = getEncoding(data)
|
||||
if not encoding:
|
||||
encoding = 'latin-1'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue