commit a0982944464b94c2965e4776f376b66903f82764
author Guido van Rossum <guido@python.org> Tue Jul 10 08:30:03 2007 +0000
committer Guido van Rossum <guido@python.org> Tue Jul 10 08:30:03 2007 +0000
tree da605f1e21057be547c9e75b73261ae815f38b34
parent 6718062538e642d62c626fd033f2c3a2356c5505

Make test_urllib.py pass.  Mostly str/bytes issues.
Also fix mac toolbox glue to accept str, str8, bytes for
255-byte strings.

Lib/test/test_urllib.py

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)