[Python-checkins] Clean up compatibility code in importlib fixtures (GH-19156) (#19543)

[Miss Islington (bot)]

https://github.com/python/cpython/commit/5594c07d97cc56ec7fabc66c6a5c644d3b809612
commit: 5594c07d97cc56ec7fabc66c6a5c644d3b809612
branch: 3.8
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2020-05-27T09:05:03-04:00
summary:

Clean up compatibility code in importlib fixtures (GH-19156) (#19543)

(cherry picked from commit 574547a75c79b506261520c5773ae08a1dcea1b9)

Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>

Co-authored-by: Jason R. Coombs <jaraco at jaraco.com>

files:
M Lib/test/test_importlib/fixtures.py

diff --git a/Lib/test/test_importlib/fixtures.py b/Lib/test/test_importlib/fixtures.py
index 695c92a786cb0..d923cec26ea8f 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 @@ def install_finder(finder):
 
 class Fixtures:
     def setUp(self):
-        self.fixtures = ExitStack()
+        self.fixtures = contextlib.ExitStack()
         self.addCleanup(self.fixtures.close)