Clean up compatibility code in importlib fixtures (GH-19156) (#19543)
(cherry picked from commit 574547a75c79b506261520c5773ae08a1dcea1b9)
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index 695c92a..d923cec 100644
--- a/Lib/test/test_importlib/fixtures.py
+++ b/Lib/test/test_importlib/fixtures.py
@@ -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 @@
class Fixtures:
def setUp(self):
- self.fixtures = ExitStack()
+ self.fixtures = contextlib.ExitStack()
self.addCleanup(self.fixtures.close)