From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 1 Mar 2014 15:34:22 +0000 (-0500)
Subject: merge 3.3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=126041844c3d5dc378a8828b508c76a694bccf2b;p=python

merge 3.3
---

126041844c3d5dc378a8828b508c76a694bccf2b
diff --cc Lib/test/test_source_encoding.py
index 92cf8d94c5,324ae38619..0c41e50662
--- a/Lib/test/test_source_encoding.py
+++ b/Lib/test/test_source_encoding.py
@@@ -59,14 -55,6 +59,15 @@@ class SourceEncodingTest(unittest.TestC
          # two bytes in common with the UTF-8 BOM
          self.assertRaises(SyntaxError, eval, b'\xef\xbb\x20')
  
 +    def test_20731(self):
 +        sub = subprocess.Popen([sys.executable,
 +                        os.path.join(os.path.dirname(__file__),
 +                                     'coding20731.py')],
 +                        stderr=subprocess.PIPE)
 +        err = sub.communicate()[1]
-         self.assertEquals(err, b'')
++        self.assertEqual(sub.returncode, 0)
++        self.assertNotIn(b'SyntaxError', err)
 +
      def test_error_message(self):
          compile(b'# -*- coding: iso-8859-15 -*-\n', 'dummy', 'exec')
          compile(b'\xef\xbb\xbf\n', 'dummy', 'exec')