- Re-enable lib2to3's test_parser.py tests, though with an expected failure

  (see issue 13125).

Lib/lib2to3/tests/test_parser.py

@@ -166,7 +166,7 @@ class TestParserIdempotency(support.TestCase):
                 encoding = tokenize.detect_encoding(fp.readline)[0]
             self.assertTrue(encoding is not None,
                             "can't detect encoding for %s" % filepath)
-            with open(filepath, "r") as fp:
+            with open(filepath, "r", encoding=encoding) as fp:
                 source = fp.read()
             try:
                 tree = driver.parse_string(source)
@@ -174,8 +174,6 @@ class TestParserIdempotency(support.TestCase):
                 print('ParseError on file', filepath, err)
                 continue
             new = str(tree)
-            if encoding:
-                new = new.encode(encoding)
             if diff(filepath, new):
                 self.fail("Idempotency failed: %s" % filepath)
 

Lib/test/test_lib2to3.py

@@ -9,7 +9,7 @@ from test.support import run_unittest
 def suite():
     tests = unittest.TestSuite()
     loader = unittest.TestLoader()
-    for m in (test_fixers, test_pytree,test_util, test_refactor, test_parser,
+    for m in (test_fixers, test_pytree, test_util, test_refactor, test_parser,
               test_main_):
         tests.addTests(loader.loadTestsFromModule(m))
     return tests