[Python-checkins] cpython (merge 2.7 -> 2.7): Issue #18048: Merge test_pep263.py and test_coding.py into
serhiy.storchaka
python-checkins at python.org
Sun Mar 20 16:16:12 EDT 2016
https://hg.python.org/cpython/rev/c42d743779bd
changeset: 100619:c42d743779bd
branch: 2.7
parent: 100618:deadfb03dec0
parent: 100617:776e9b8bdd96
user: Serhiy Storchaka <storchaka at gmail.com>
date: Sun Mar 20 21:20:07 2016 +0200
summary:
Issue #18048: Merge test_pep263.py and test_coding.py into test_source_encoding.py.
files:
Lib/test/test_pep263.py | 71 --------------------
Lib/test/test_source_encoding.py | 64 +++++++++++++++++-
2 files changed, 62 insertions(+), 73 deletions(-)
diff --git a/Lib/test/test_pep263.py b/Lib/test/test_pep263.py
deleted file mode 100644
--- a/Lib/test/test_pep263.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: koi8-r -*-
-
-import unittest
-from test import test_support
-
-class PEP263Test(unittest.TestCase):
-
- def test_pep263(self):
- self.assertEqual(
- u"ðÉÔÏÎ".encode("utf-8"),
- '\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'
- )
- self.assertEqual(
- u"\ð".encode("utf-8"),
- '\\\xd0\x9f'
- )
-
- def test_compilestring(self):
- # see #1882
- c = compile("\n# coding: utf-8\nu = u'\xc3\xb3'\n", "dummy", "exec")
- d = {}
- exec c in d
- self.assertEqual(d['u'], u'\xf3')
-
-
- def test_issue3297(self):
- c = compile("a, b = '\U0001010F', '\\U0001010F'", "dummy", "exec")
- d = {}
- exec(c, d)
- self.assertEqual(d['a'], d['b'])
- self.assertEqual(len(d['a']), len(d['b']))
-
- def test_issue7820(self):
- # Ensure that check_bom() restores all bytes in the right order if
- # check_bom() fails in pydebug mode: a buffer starts with the first
- # byte of a valid BOM, but next bytes are different
-
- # one byte in common with the UTF-16-LE BOM
- self.assertRaises(SyntaxError, eval, '\xff\x20')
-
- # two bytes in common with the UTF-8 BOM
- self.assertRaises(SyntaxError, eval, '\xef\xbb\x20')
-
- def test_error_message(self):
- compile('# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
- compile('\xef\xbb\xbf\n', 'dummy', 'exec')
- compile('\xef\xbb\xbf# -*- coding: utf-8 -*-\n', 'dummy', 'exec')
- with self.assertRaisesRegexp(SyntaxError, 'fake'):
- compile('# -*- coding: fake -*-\n', 'dummy', 'exec')
- with self.assertRaisesRegexp(SyntaxError, 'iso-8859-15'):
- compile('\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
- 'dummy', 'exec')
- with self.assertRaisesRegexp(SyntaxError, 'BOM'):
- compile('\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
- 'dummy', 'exec')
- with self.assertRaisesRegexp(SyntaxError, 'fake'):
- compile('\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
- with self.assertRaisesRegexp(SyntaxError, 'BOM'):
- compile('\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
-
- def test_non_unicode_codec(self):
- with self.assertRaisesRegexp(SyntaxError,
- 'codec did not return a unicode'):
- from test import bad_coding3
-
-
-def test_main():
- test_support.run_unittest(PEP263Test)
-
-if __name__=="__main__":
- test_main()
diff --git a/Lib/test/test_source_encoding.py b/Lib/test/test_source_encoding.py
--- a/Lib/test/test_source_encoding.py
+++ b/Lib/test/test_source_encoding.py
@@ -1,8 +1,68 @@
+# -*- coding: koi8-r -*-
import test.test_support, unittest
import os
-class CodingTest(unittest.TestCase):
+class SourceEncodingTest(unittest.TestCase):
+
+ def test_pep263(self):
+ self.assertEqual(
+ u"ðÉÔÏÎ".encode("utf-8"),
+ '\xd0\x9f\xd0\xb8\xd1\x82\xd0\xbe\xd0\xbd'
+ )
+ self.assertEqual(
+ u"\ð".encode("utf-8"),
+ '\\\xd0\x9f'
+ )
+
+ def test_compilestring(self):
+ # see #1882
+ c = compile("\n# coding: utf-8\nu = u'\xc3\xb3'\n", "dummy", "exec")
+ d = {}
+ exec c in d
+ self.assertEqual(d['u'], u'\xf3')
+
+ def test_issue3297(self):
+ c = compile("a, b = '\U0001010F', '\\U0001010F'", "dummy", "exec")
+ d = {}
+ exec(c, d)
+ self.assertEqual(d['a'], d['b'])
+ self.assertEqual(len(d['a']), len(d['b']))
+
+ def test_issue7820(self):
+ # Ensure that check_bom() restores all bytes in the right order if
+ # check_bom() fails in pydebug mode: a buffer starts with the first
+ # byte of a valid BOM, but next bytes are different
+
+ # one byte in common with the UTF-16-LE BOM
+ self.assertRaises(SyntaxError, eval, '\xff\x20')
+
+ # two bytes in common with the UTF-8 BOM
+ self.assertRaises(SyntaxError, eval, '\xef\xbb\x20')
+
+ def test_error_message(self):
+ compile('# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
+ compile('\xef\xbb\xbf\n', 'dummy', 'exec')
+ compile('\xef\xbb\xbf# -*- coding: utf-8 -*-\n', 'dummy', 'exec')
+ with self.assertRaisesRegexp(SyntaxError, 'fake'):
+ compile('# -*- coding: fake -*-\n', 'dummy', 'exec')
+ with self.assertRaisesRegexp(SyntaxError, 'iso-8859-15'):
+ compile('\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
+ 'dummy', 'exec')
+ with self.assertRaisesRegexp(SyntaxError, 'BOM'):
+ compile('\xef\xbb\xbf# -*- coding: iso-8859-15 -*-\n',
+ 'dummy', 'exec')
+ with self.assertRaisesRegexp(SyntaxError, 'fake'):
+ compile('\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
+ with self.assertRaisesRegexp(SyntaxError, 'BOM'):
+ compile('\xef\xbb\xbf# -*- coding: fake -*-\n', 'dummy', 'exec')
+
+ def test_non_unicode_codec(self):
+ with self.assertRaisesRegexp(SyntaxError,
+ 'codec did not return a unicode'):
+ from test import bad_coding3
+
+
def test_bad_coding(self):
module_name = 'bad_coding'
self.verify_bad_module(module_name)
@@ -31,7 +91,7 @@
def test_main():
- test.test_support.run_unittest(CodingTest)
+ test.test_support.run_unittest(SourceEncodingTest)
if __name__ == "__main__":
test_main()
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list