]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Clean up compatibility code in importlib fixtures (GH-19156) (#19543)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 27 May 2020 13:05:03 +0000 (06:05 -0700)
committerGitHub <noreply@github.com>
Wed, 27 May 2020 13:05:03 +0000 (09:05 -0400)
(cherry picked from commit 574547a75c79b506261520c5773ae08a1dcea1b9)

Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Lib/test/test_importlib/fixtures.py

index 695c92a786cb0b4f7491f9f0f57915c05b31924d..d923cec26ea8f5f6ca90c7e59fa0bace473222de 100644 (file)
@@ -1,25 +1,11 @@
-from __future__ import unicode_literals
-
 import os
 import sys
 import shutil
+import pathlib
 import tempfile
 import textwrap
 import contextlib
 
-try:
-    from contextlib import ExitStack
-except ImportError:
-    from contextlib2 import ExitStack
-
-try:
-    import pathlib
-except ImportError:
-    import pathlib2 as pathlib
-
-
-__metaclass__ = type
-
 
 @contextlib.contextmanager
 def tempdir():
@@ -58,7 +44,7 @@ def install_finder(finder):
 
 class Fixtures:
     def setUp(self):
-        self.fixtures = ExitStack()
+        self.fixtures = contextlib.ExitStack()
         self.addCleanup(self.fixtures.close)