(original) (raw)

changeset: 92128:7cdc941d5180 parent: 92126:3153a400b739 parent: 92127:a894b629bbea user: Serhiy Storchaka storchaka@gmail.com date: Sun Aug 17 12:21:06 2014 +0300 description: Issue #22165: Fixed test_undecodable_filename on non-UTF-8 locales. diff -r 3153a400b739 -r 7cdc941d5180 Lib/test/test_httpservers.py --- a/Lib/test/test_httpservers.py Sun Aug 17 08:24:49 2014 +0300 +++ b/Lib/test/test_httpservers.py Sun Aug 17 12:21:06 2014 +0300 @@ -272,6 +272,7 @@ @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 @@ 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) /storchaka@gmail.com