diff options
| -rw-r--r-- | Lib/httplib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_urllib.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Lib/httplib.py b/Lib/httplib.py index 9cdfd2a..9887540 100644 --- a/Lib/httplib.py +++ b/Lib/httplib.py @@ -373,7 +373,7 @@ class HTTPResponse: # Assume it's a Simple-Response from an 0.9 server. # We have to convert the first line back to raw bytes # because self.fp.readline() needs to return bytes. - self.fp = LineAndFileWrapper(bytes(line), self.fp) + self.fp = LineAndFileWrapper(bytes(line, "ascii"), self.fp) return "HTTP/0.9", 200, "" # The status code is a three-digit number diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index dde5d58..875903e 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -30,7 +30,7 @@ class urlopen_FileTests(unittest.TestCase): def setUp(self): """Setup of a temp file to use for testing""" - self.text = bytes("test_urllib: %s\n" % self.__class__.__name__) + self.text = bytes("test_urllib: %s\n" % self.__class__.__name__, "ascii") FILE = open(test_support.TESTFN, 'wb') try: FILE.write(self.text) @@ -168,7 +168,7 @@ class urlretrieve_FileTests(unittest.TestCase): def constructLocalFileUrl(self, filePath): return "file://%s" % urllib.pathname2url(os.path.abspath(filePath)) - def createNewTempFile(self, data=""): + def createNewTempFile(self, data=b""): """Creates a new temporary file containing the specified data, registers the file for deletion during the test fixture tear down, and returns the absolute path of the file.""" @@ -246,7 +246,7 @@ class urlretrieve_FileTests(unittest.TestCase): report = [] def hooktester(count, block_size, total_size, _report=report): _report.append((count, block_size, total_size)) - srcFileName = self.createNewTempFile("x" * 5) + srcFileName = self.createNewTempFile(b"x" * 5) urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), test_support.TESTFN, hooktester) self.assertEqual(len(report), 2) @@ -260,7 +260,7 @@ class urlretrieve_FileTests(unittest.TestCase): report = [] def hooktester(count, block_size, total_size, _report=report): _report.append((count, block_size, total_size)) - srcFileName = self.createNewTempFile("x" * 8193) + srcFileName = self.createNewTempFile(b"x" * 8193) urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), test_support.TESTFN, hooktester) self.assertEqual(len(report), 3) |