mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Make test_urllib be strict about str/bytes.

Browse source 
(One change to httplib.py, but not enough for test_httplib.)
This commit is contained in:
Guido van Rossum 2007-08-29 01:53:26 +00:00
parent 7436a06375
commit 70d0ddab53
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Lib/httplib.py
View file

@ -373,7 +373,7 @@ class HTTPResponse:
# Assume it's a Simple-Response from an 0.9 server. # Assume it's a Simple-Response from an 0.9 server.
# We have to convert the first line back to raw bytes # We have to convert the first line back to raw bytes
# because self.fp.readline() needs to return 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, "" return "HTTP/0.9", 200, ""
# The status code is a three-digit number # The status code is a three-digit number

8
Lib/test/test_urllib.py
View file

@ -30,7 +30,7 @@ class urlopen_FileTests(unittest.TestCase):
def setUp(self): def setUp(self):
"""Setup of a temp file to use for testing""" """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') FILE = open(test_support.TESTFN, 'wb')
try: try:
FILE.write(self.text) FILE.write(self.text)
@ -168,7 +168,7 @@ class urlretrieve_FileTests(unittest.TestCase):
def constructLocalFileUrl(self, filePath): def constructLocalFileUrl(self, filePath):
return "file://%s" % urllib.pathname2url(os.path.abspath(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, """Creates a new temporary file containing the specified data,
registers the file for deletion during the test fixture tear down, and registers the file for deletion during the test fixture tear down, and
returns the absolute path of the file.""" returns the absolute path of the file."""
@ -246,7 +246,7 @@ class urlretrieve_FileTests(unittest.TestCase):
report = [] report = []
def hooktester(count, block_size, total_size, _report=report): def hooktester(count, block_size, total_size, _report=report):
_report.append((count, block_size, total_size)) _report.append((count, block_size, total_size))
srcFileName = self.createNewTempFile("x" * 5) srcFileName = self.createNewTempFile(b"x" * 5)
urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), urllib.urlretrieve(self.constructLocalFileUrl(srcFileName),
test_support.TESTFN, hooktester) test_support.TESTFN, hooktester)
self.assertEqual(len(report), 2) self.assertEqual(len(report), 2)
@ -260,7 +260,7 @@ class urlretrieve_FileTests(unittest.TestCase):
report = [] report = []
def hooktester(count, block_size, total_size, _report=report): def hooktester(count, block_size, total_size, _report=report):
_report.append((count, block_size, total_size)) _report.append((count, block_size, total_size))
srcFileName = self.createNewTempFile("x" * 8193) srcFileName = self.createNewTempFile(b"x" * 8193)
urllib.urlretrieve(self.constructLocalFileUrl(srcFileName), urllib.urlretrieve(self.constructLocalFileUrl(srcFileName),
test_support.TESTFN, hooktester) test_support.TESTFN, hooktester)
self.assertEqual(len(report), 3) self.assertEqual(len(report), 3)