]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Clean up compatibility code in importlib fixtures (#19156)
authorJason R. Coombs <jaraco@jaraco.com>
Wed, 15 Apr 2020 17:55:43 +0000 (13:55 -0400)
committerGitHub <noreply@github.com>
Wed, 15 Apr 2020 17:55:43 +0000 (13:55 -0400)
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)