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

Wed Apr 15 13:55:51 EDT 2020

https://github.com/python/cpython/commit/574547a75c79b506261520c5773ae08a1dcea1b9
commit: 574547a75c79b506261520c5773ae08a1dcea1b9
branch: master
author: Jason R. Coombs <jaraco at jaraco.com>
committer: GitHub <noreply at github.com>
date: 2020年04月15日T13:55:43-04:00
summary:
Clean up compatibility code in importlib fixtures (#19156)
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)
 
 
