Commit f9179378 authored by Brett Cannon's avatar Brett Cannon

Move code from test_importhooks into test_zipimport.

parent 6eeb430a
...@@ -7,7 +7,6 @@ import time ...@@ -7,7 +7,6 @@ import time
import unittest import unittest
from test import support from test import support
from test.test_importhooks import ImportHooksBaseTestCase, test_src, test_co
from zipfile import ZipFile, ZipInfo, ZIP_STORED, ZIP_DEFLATED from zipfile import ZipFile, ZipInfo, ZIP_STORED, ZIP_DEFLATED
...@@ -17,6 +16,14 @@ import doctest ...@@ -17,6 +16,14 @@ import doctest
import inspect import inspect
import io import io
from traceback import extract_tb, extract_stack, print_tb from traceback import extract_tb, extract_stack, print_tb
test_src = """\
def get_name():
return __name__
def get_file():
return __file__
"""
test_co = compile(test_src, "<???>", "exec")
raise_src = 'def do_raise(): raise TypeError\n' raise_src = 'def do_raise(): raise TypeError\n'
def make_pyc(co, mtime, size): def make_pyc(co, mtime, size):
...@@ -46,6 +53,23 @@ pyc_file = imp.cache_from_source(TESTMOD + '.py') ...@@ -46,6 +53,23 @@ pyc_file = imp.cache_from_source(TESTMOD + '.py')
pyc_ext = ('.pyc' if __debug__ else '.pyo') pyc_ext = ('.pyc' if __debug__ else '.pyo')
class ImportHooksBaseTestCase(unittest.TestCase):
def setUp(self):
self.path = sys.path[:]
self.meta_path = sys.meta_path[:]
self.path_hooks = sys.path_hooks[:]
sys.path_importer_cache.clear()
self.modules_before = support.modules_setup()
def tearDown(self):
sys.path[:] = self.path
sys.meta_path[:] = self.meta_path
sys.path_hooks[:] = self.path_hooks
sys.path_importer_cache.clear()
support.modules_cleanup(*self.modules_before)
class UncompressedZipImportTestCase(ImportHooksBaseTestCase): class UncompressedZipImportTestCase(ImportHooksBaseTestCase):
compression = ZIP_STORED compression = ZIP_STORED
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment