Commit 6ae6ad82 authored by Neal Norwitz's avatar Neal Norwitz

Get the test to pass on space Ubuntu/Debian and ppc. It was failing

to decode 'Journ\xc3\xa9es Python' as ASCII.
parent 548de777
...@@ -121,7 +121,10 @@ class urlopenNetworkTests(unittest.TestCase): ...@@ -121,7 +121,10 @@ class urlopenNetworkTests(unittest.TestCase):
# Make sure fd returned by fileno is valid. # Make sure fd returned by fileno is valid.
open_url = self.urlopen("http://www.python.org/") open_url = self.urlopen("http://www.python.org/")
fd = open_url.fileno() fd = open_url.fileno()
# XXX(nnorwitz): There is currently no way to pass errors, encoding,
# etc to fdopen. :-(
FILE = os.fdopen(fd) FILE = os.fdopen(fd)
FILE._errors = 'ignore'
try: try:
self.assert_(FILE.read(), "reading from file created using fd " self.assert_(FILE.read(), "reading from file created using fd "
"returned by fileno failed") "returned by fileno failed")
...@@ -152,7 +155,7 @@ class urlretrieveNetworkTests(unittest.TestCase): ...@@ -152,7 +155,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
file_location,info = self.urlretrieve("http://www.python.org/") file_location,info = self.urlretrieve("http://www.python.org/")
self.assert_(os.path.exists(file_location), "file location returned by" self.assert_(os.path.exists(file_location), "file location returned by"
" urlretrieve is not a valid path") " urlretrieve is not a valid path")
FILE = open(file_location) FILE = open(file_location, errors='ignore')
try: try:
self.assert_(FILE.read(), "reading from the file location returned" self.assert_(FILE.read(), "reading from the file location returned"
" by urlretrieve failed") " by urlretrieve failed")
...@@ -166,7 +169,7 @@ class urlretrieveNetworkTests(unittest.TestCase): ...@@ -166,7 +169,7 @@ class urlretrieveNetworkTests(unittest.TestCase):
test_support.TESTFN) test_support.TESTFN)
self.assertEqual(file_location, test_support.TESTFN) self.assertEqual(file_location, test_support.TESTFN)
self.assert_(os.path.exists(file_location)) self.assert_(os.path.exists(file_location))
FILE = open(file_location) FILE = open(file_location, errors='ignore')
try: try:
self.assert_(FILE.read(), "reading from temporary file failed") self.assert_(FILE.read(), "reading from temporary file failed")
finally: finally:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment