Make test_urllib.py pass. Mostly str/bytes issues.
Also fix mac toolbox glue to accept str, str8, bytes for
255-byte strings.
diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py
index 7a3f207..e94fc22 100644
--- a/Lib/test/test_urllib.py
+++ b/Lib/test/test_urllib.py
@@ -30,7 +30,7 @@
def setUp(self):
"""Setup of a temp file to use for testing"""
- self.text = "test_urllib: %s\n" % self.__class__.__name__
+ self.text = bytes("test_urllib: %s\n" % self.__class__.__name__)
FILE = open(test_support.TESTFN, 'wb')
try:
FILE.write(self.text)
@@ -57,7 +57,7 @@
def test_readline(self):
self.assertEqual(self.text, self.returned_obj.readline())
- self.assertEqual('', self.returned_obj.readline(),
+ self.assertEqual(b'', self.returned_obj.readline(),
"calling readline() after exhausting the file did not"
" return an empty string")
@@ -150,7 +150,7 @@
# Create a temporary file.
self.registerFileForCleanUp(test_support.TESTFN)
- self.text = 'testing urllib.urlretrieve'
+ self.text = b'testing urllib.urlretrieve'
try:
FILE = open(test_support.TESTFN, 'wb')
FILE.write(self.text)
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 @@
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 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()