merge 3.3

diff --cc Lib/test/test_source_encoding.py
index 92cf8d94c5978d891eebe2a4c69be0f65dc9559a,324ae3861965d1f9500fe21872ac58fab61ac2ca..0c41e50662a9f07fbcea498de5f521d86ffa843c
--- 1/Lib/test/test_source_encoding.py
--- 2/Lib/test/test_pep263.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')
  
-         self.assertEquals(err, b'')
 +    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.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')