Issue #29407: Merge from 3.5

5 files changed, 20 insertions, 10 deletions

diff --git a/Lib/test/test_tools/__init__.py b/Lib/test/test_tools/__init__.py
index 04c8726e11..4d0fca330a 100644
--- a/Lib/test/test_tools/__init__.py
+++ b/Lib/test/test_tools/__init__.py
@@ -3,7 +3,6 @@ import os
 import unittest
 import importlib
 from test import support
-from fnmatch import fnmatch
 
 basepath = os.path.dirname(                 # <src/install dir>
                 os.path.dirname(                # Lib
diff --git a/Lib/test/test_tools/test_gprof2html.py b/Lib/test/test_tools/test_gprof2html.py
index 0c294ec0c4..9489ed91f9 100644
--- a/Lib/test/test_tools/test_gprof2html.py
+++ b/Lib/test/test_tools/test_gprof2html.py
@@ -2,12 +2,11 @@
 
 import os
 import sys
-import importlib
 import unittest
 from unittest import mock
 import tempfile
 
-from test.test_tools import scriptsdir, skip_if_missing, import_tool
+from test.test_tools import skip_if_missing, import_tool
 
 skip_if_missing()
 
diff --git a/Lib/test/test_tools/test_md5sum.py b/Lib/test/test_tools/test_md5sum.py
index 1305295ef1..fb565b7377 100644
--- a/Lib/test/test_tools/test_md5sum.py
+++ b/Lib/test/test_tools/test_md5sum.py
@@ -1,12 +1,11 @@
 """Tests for the md5sum script in the Tools directory."""
 
 import os
-import sys
 import unittest
 from test import support
 from test.support.script_helper import assert_python_ok, assert_python_failure
 
-from test.test_tools import scriptsdir, import_tool, skip_if_missing
+from test.test_tools import scriptsdir, skip_if_missing
 
 skip_if_missing()
 
diff --git a/Lib/test/test_tools/test_pdeps.py b/Lib/test/test_tools/test_pdeps.py
index 091fa6a06d..27cbfe215d 100644
--- a/Lib/test/test_tools/test_pdeps.py
+++ b/Lib/test/test_tools/test_pdeps.py
@@ -1,12 +1,10 @@
 """Tests for the pdeps script in the Tools directory."""
 
 import os
-import sys
 import unittest
 import tempfile
-from test import support
 
-from test.test_tools import scriptsdir, skip_if_missing, import_tool
+from test.test_tools import skip_if_missing, import_tool
 
 skip_if_missing()
 
diff --git a/Lib/test/test_tools/test_unparse.py b/Lib/test/test_tools/test_unparse.py
index 734bbc215a..65dee1b5ae 100644
--- a/Lib/test/test_tools/test_unparse.py
+++ b/Lib/test/test_tools/test_unparse.py
@@ -134,6 +134,11 @@ class ASTTestCase(unittest.TestCase):
 class UnparseTestCase(ASTTestCase):
     # Tests for specific bugs found in earlier versions of unparse
 
+    def test_fstrings(self):
+        # See issue 25180
+        self.check_roundtrip(r"""f'{f"{0}"*3}'""")
+        self.check_roundtrip(r"""f'{f"{y}"*3}'""")
+
     def test_del_statement(self):
         self.check_roundtrip("del x, y, z")
 
@@ -279,8 +284,18 @@ class DirectoryTestCase(ASTTestCase):
         for filename in names:
             if test.support.verbose:
                 print('Testing %s' % filename)
-            source = read_pyfile(filename)
-            self.check_roundtrip(source)
+
+            # Some f-strings are not correctly round-tripped by
+            #  Tools/parser/unparse.py.  See issue 28002 for details.
+            #  We need to skip files that contain such f-strings.
+            if os.path.basename(filename) in ('test_fstring.py', ):
+                if test.support.verbose:
+                    print(f'Skipping {filename}: see issue 28002')
+                continue
+
+            with self.subTest(filename=filename):
+                source = read_pyfile(filename)
+                self.check_roundtrip(source)
 
 
 if __name__ == '__main__':