summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-08-17 09:20:02 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-08-17 09:20:02 (GMT)
commita64ce5d7446f226805ff27d99dcecbc8681733d8 (patch)
tree4101b0fd84b1db73f1815f7901d2642d18ce3cd8
parentcb5bc408ad525c695b00bf78fdf69c24028fed96 (diff)
downloadcpython-a64ce5d7446f226805ff27d99dcecbc8681733d8.zip
cpython-a64ce5d7446f226805ff27d99dcecbc8681733d8.tar.gz
cpython-a64ce5d7446f226805ff27d99dcecbc8681733d8.tar.bz2
Issue #22165: Fixed test_undecodable_filename on non-UTF-8 locales.
-rw-r--r--Lib/test/test_httpservers.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 8c22651..ad058b5 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -272,6 +272,7 @@ class SimpleHTTPServerTestCase(BaseTestCase):
@unittest.skipUnless(support.TESTFN_UNDECODABLE,
'need support.TESTFN_UNDECODABLE')
def test_undecodable_filename(self):
+ enc = sys.getfilesystemencoding()
filename = os.fsdecode(support.TESTFN_UNDECODABLE) + '.txt'
with open(os.path.join(self.tempdir, filename), 'wb') as f:
f.write(support.TESTFN_UNDECODABLE)
@@ -279,9 +280,9 @@ class SimpleHTTPServerTestCase(BaseTestCase):
body = self.check_status_and_reason(response, 200)
quotedname = urllib.parse.quote(filename, errors='surrogatepass')
self.assertIn(('href="%s"' % quotedname)
- .encode('utf-8', 'surrogateescape'), body)
+ .encode(enc, 'surrogateescape'), body)
self.assertIn(('>%s<' % html.escape(filename))
- .encode('utf-8', 'surrogateescape'), body)
+ .encode(enc, 'surrogateescape'), body)
response = self.request(self.tempdir_name + '/' + quotedname)
self.check_status_and_reason(response, 200,
data=support.TESTFN_UNDECODABLE)