mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-13 15:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pleasing the tabnanny

Browse source
This commit is contained in:
Jeremy Hylton 1999-02-25 15:59:54 +00:00
parent bff3ae1f75
commit 547c3f1c13
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/urllib.py
View file

@ -70,7 +70,7 @@ def urlretrieve(url, filename=None, reporthook=None):
global _urlopener global _urlopener
if not _urlopener: if not _urlopener:
_urlopener = FancyURLopener() _urlopener = FancyURLopener()
return _urlopener.retrieve(url, filename, reporthook) return _urlopener.retrieve(url, filename, reporthook)
def urlcleanup(): def urlcleanup():
if _urlopener: if _urlopener:
_urlopener.cleanup() _urlopener.cleanup()
@ -208,7 +208,7 @@ class URLopener:
blocknum = 1 blocknum = 1
if reporthook: if reporthook:
if headers.has_key("content-length"): if headers.has_key("content-length"):
size = int(headers["Content-Length"]) size = int(headers["Content-Length"])
reporthook(0, bs, size) reporthook(0, bs, size)
block = fp.read(bs) block = fp.read(bs)
if reporthook: if reporthook:
@ -305,7 +305,7 @@ class URLopener:
else: else:
result = method(url, fp, errcode, errmsg, result = method(url, fp, errcode, errmsg,
headers) headers)
if result: return result if result: return result
return self.http_error_default( return self.http_error_default(
url, fp, errcode, errmsg, headers) url, fp, errcode, errmsg, headers)
@ -400,14 +400,14 @@ class URLopener:
if string.lower(attr) == 'type' and \ if string.lower(attr) == 'type' and \
value in ('a', 'A', 'i', 'I', 'd', 'D'): value in ('a', 'A', 'i', 'I', 'd', 'D'):
type = string.upper(value) type = string.upper(value)
(fp, retrlen) = self.ftpcache[key].retrfile(file, type) (fp, retrlen) = self.ftpcache[key].retrfile(file, type)
if retrlen is not None and retrlen >= 0: if retrlen is not None and retrlen >= 0:
import mimetools, StringIO import mimetools, StringIO
headers = mimetools.Message(StringIO.StringIO( headers = mimetools.Message(StringIO.StringIO(
'Content-Length: %d\n' % retrlen)) 'Content-Length: %d\n' % retrlen))
else: else:
headers = noheaders() headers = noheaders()
return addinfourl(fp, headers, "ftp:" + url) return addinfourl(fp, headers, "ftp:" + url)
except ftperrors(), msg: except ftperrors(), msg:
raise IOError, ('ftp error', msg), sys.exc_info()[2] raise IOError, ('ftp error', msg), sys.exc_info()[2]