Author: guido.van.rossum
Date: Wed Aug 29 03:53:26 2007
New Revision: 57636
Modified:
python/branches/py3k/Lib/httplib.py
python/branches/py3k/Lib/test/test_urllib.py
Log:
Make test_urllib be strict about str/bytes.
(One change to httplib.py, but not enough for test_httplib.)
Modified: python/branches/py3k/Lib/httplib.py
==============================================================================
--- python/branches/py3k/Lib/httplib.py (original)
+++ python/branches/py3k/Lib/httplib.py Wed Aug 29 03:53:26 2007
@@ -373,7 +373,7 @@
# 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
Modified: python/branches/py3k/Lib/test/test_urllib.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib.py (original)
+++ python/branches/py3k/Lib/test/test_urllib.py Wed Aug 29 03:53:26 2007
@@ -30,7 +30,7 @@
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 @@
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 @@
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 @@
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)
_______________________________________________
Python-3000-checkins mailing list
[email protected]
http://mail.python.org/mailman/listinfo/python-3000-checkins
