traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge 3.2 (#20695)

This commit is contained in:
Benjamin Peterson 2014-02-19 23:06:24 -05:00
parent 665a2bcdf8 1b94030b37
commit a96fd48298
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Lib/test/test_urllibnet.py
View File

@ -103,7 +103,7 @@ class urlopenNetworkTests(unittest.TestCase):
# Make sure fd returned by fileno is valid. # Make sure fd returned by fileno is valid.
with self.urlopen("http://www.python.org/", timeout=None) as open_url: with self.urlopen("http://www.python.org/", timeout=None) as open_url:
fd = open_url.fileno() fd = open_url.fileno()
with os.fdopen(fd, encoding='utf-8') as f: with os.fdopen(fd, 'rb') as f:
self.assertTrue(f.read(), "reading from file created using fd " self.assertTrue(f.read(), "reading from file created using fd "
"returned by fileno failed") "returned by fileno failed")
@ -151,7 +151,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
with self.urlretrieve("http://www.python.org/") as (file_location, info): with self.urlretrieve("http://www.python.org/") as (file_location, info):
self.assertTrue(os.path.exists(file_location), "file location returned by" self.assertTrue(os.path.exists(file_location), "file location returned by"
" urlretrieve is not a valid path") " urlretrieve is not a valid path")
with open(file_location, encoding='utf-8') as f: with open(file_location, 'rb') as f:
self.assertTrue(f.read(), "reading from the file location returned" self.assertTrue(f.read(), "reading from the file location returned"
" by urlretrieve failed") " by urlretrieve failed")
@ -161,7 +161,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
support.TESTFN) as (file_location, info): support.TESTFN) as (file_location, info):
self.assertEqual(file_location, support.TESTFN) self.assertEqual(file_location, support.TESTFN)
self.assertTrue(os.path.exists(file_location)) self.assertTrue(os.path.exists(file_location))
with open(file_location, encoding='utf-8') as f: with open(file_location, 'rb') as f:
self.assertTrue(f.read(), "reading from temporary file failed") self.assertTrue(f.read(), "reading from temporary file failed")
def test_header(self): def test_header(self):
@ -170,7 +170,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
self.assertIsInstance(info, email.message.Message, self.assertIsInstance(info, email.message.Message,
"info is not an instance of email.message.Message") "info is not an instance of email.message.Message")
logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png" logo = "http://www.python.org/static/community_logos/python-logo-master-v3-TM.png"
def test_data_header(self): def test_data_header(self):
with self.urlretrieve(self.logo) as (file_location, fileheaders): with self.urlretrieve(self.logo) as (file_location, fileheaders):