Skip to content

Clean up compatibility code in importlib fixtures #19156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 15, 2020
Merged

Clean up compatibility code in importlib fixtures #19156

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions Lib/test/test_importlib/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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():
Expand Down Expand Up @@ -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)


Expand Down