diff options
| author | Guido van Rossum <guido@python.org> | 2007-07-10 08:30:03 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-07-10 08:30:03 (GMT) |
| commit | a0982944464b94c2965e4776f376b66903f82764 (patch) | |
| tree | da605f1e21057be547c9e75b73261ae815f38b34 /Lib/urllib.py | |
| parent | 6718062538e642d62c626fd033f2c3a2356c5505 (diff) | |
| download | cpython-a0982944464b94c2965e4776f376b66903f82764.zip cpython-a0982944464b94c2965e4776f376b66903f82764.tar.gz cpython-a0982944464b94c2965e4776f376b66903f82764.tar.bz2 | |
Make test_urllib.py pass. Mostly str/bytes issues.
Also fix mac toolbox glue to accept str, str8, bytes for
255-byte strings.
Diffstat (limited to 'Lib/urllib.py')
| -rw-r--r-- | Lib/urllib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index c6bd87f..dcd906c 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -245,7 +245,7 @@ class URLopener: reporthook(blocknum, bs, size) while 1: block = fp.read(bs) - if block == "": + if not block: break read += len(block) tfp.write(block) @@ -976,7 +976,7 @@ def toBytes(url): def unwrap(url): """unwrap('<URL:type://host/path>') --> 'type://host/path'.""" - url = url.strip() + url = str(url).strip() if url[:1] == '<' and url[-1:] == '>': url = url[1:-1].strip() if url[:4] == 'URL:': url = url[4:].strip() |