Issue #18202: Fix minor bugs and cleanup test_source_encoding.py.
This commit is contained in:
commit
10dc0eb5a4
|
@ -94,31 +94,31 @@ class SourceEncodingTest(unittest.TestCase):
|
||||||
|
|
||||||
def test_exec_valid_coding(self):
|
def test_exec_valid_coding(self):
|
||||||
d = {}
|
d = {}
|
||||||
exec('# coding: cp949\na = 5\n', d)
|
exec(b'# coding: cp949\na = "\xaa\xa7"\n', d)
|
||||||
self.assertEqual(d['a'], 5)
|
self.assertEqual(d['a'], '\u3047')
|
||||||
|
|
||||||
def test_file_parse(self):
|
def test_file_parse(self):
|
||||||
# issue1134: all encodings outside latin-1 and utf-8 fail on
|
# issue1134: all encodings outside latin-1 and utf-8 fail on
|
||||||
# multiline strings and long lines (>512 columns)
|
# multiline strings and long lines (>512 columns)
|
||||||
unload(TESTFN)
|
unload(TESTFN)
|
||||||
sys.path.insert(0, os.curdir)
|
|
||||||
filename = TESTFN + ".py"
|
filename = TESTFN + ".py"
|
||||||
f = open(filename, "w")
|
f = open(filename, "w", encoding="cp1252")
|
||||||
|
sys.path.insert(0, os.curdir)
|
||||||
try:
|
try:
|
||||||
f.write("# -*- coding: cp1252 -*-\n")
|
with f:
|
||||||
f.write("'''A short string\n")
|
f.write("# -*- coding: cp1252 -*-\n")
|
||||||
f.write("'''\n")
|
f.write("'''A short string\n")
|
||||||
f.write("'A very long string %s'\n" % ("X" * 1000))
|
f.write("'''\n")
|
||||||
f.close()
|
f.write("'A very long string %s'\n" % ("X" * 1000))
|
||||||
|
|
||||||
importlib.invalidate_caches()
|
importlib.invalidate_caches()
|
||||||
__import__(TESTFN)
|
__import__(TESTFN)
|
||||||
finally:
|
finally:
|
||||||
f.close()
|
del sys.path[0]
|
||||||
unlink(filename)
|
unlink(filename)
|
||||||
unlink(filename + "c")
|
unlink(filename + "c")
|
||||||
|
unlink(filename + "o")
|
||||||
unload(TESTFN)
|
unload(TESTFN)
|
||||||
del sys.path[0]
|
|
||||||
|
|
||||||
def test_error_from_string(self):
|
def test_error_from_string(self):
|
||||||
# See http://bugs.python.org/issue6289
|
# See http://bugs.python.org/issue6289
|
||||||
|
@ -127,7 +127,8 @@ class SourceEncodingTest(unittest.TestCase):
|
||||||
compile(input, "<string>", "exec")
|
compile(input, "<string>", "exec")
|
||||||
expected = "'ascii' codec can't decode byte 0xe2 in position 16: " \
|
expected = "'ascii' codec can't decode byte 0xe2 in position 16: " \
|
||||||
"ordinal not in range(128)"
|
"ordinal not in range(128)"
|
||||||
self.assertTrue(c.exception.args[0].startswith(expected))
|
self.assertTrue(c.exception.args[0].startswith(expected),
|
||||||
|
msg=c.exception.args[0])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
|
Loading…
Reference in New Issue