merge 3.3

This commit is contained in:
Benjamin Peterson 2014-03-01 10:34:22 -05:00
commit 126041844c

View file

@ -65,7 +65,8 @@ class SourceEncodingTest(unittest.TestCase):
'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')