Changeset 391 for python/trunk/Lib/test/test_coding.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/test/test_coding.py (modified) (1 diff)

python/trunk/Lib/test/test_coding.py

@@ -17 +17 @@
         path = os.path.dirname(__file__)
         filename = os.path.join(path, module_name + '.py')
-        fp = open(filename)
-        text = fp.read()
-        fp.close()
+        with open(filename) as fp:
+            text = fp.read()
         self.assertRaises(SyntaxError, compile, text, filename, 'exec')
+
+    def test_error_from_string(self):
+        # See http://bugs.python.org/issue6289
+        input = u"# coding: ascii\n\N{SNOWMAN}".encode('utf-8')
+        with self.assertRaises(SyntaxError) as c:
+            compile(input, "<string>", "exec")
+        expected = "'ascii' codec can't decode byte 0xe2 in position 16: " \
+                   "ordinal not in range(128)"
+        self.assertTrue(c.exception.args[0].startswith(expected))
+
 
 def test_main():