Issue #16803: test.test_importlib.source now tests frozen and source code
This commit is contained in:
parent
3a4586a9f9
commit
9ea8eda127
|
@ -2,8 +2,9 @@
|
||||||
from .. import util
|
from .. import util
|
||||||
from . import util as source_util
|
from . import util as source_util
|
||||||
|
|
||||||
from importlib import _bootstrap
|
importlib = util.import_importlib('importlib')
|
||||||
from importlib import machinery
|
machinery = util.import_importlib('importlib.machinery')
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
from test import support as test_support
|
from test import support as test_support
|
||||||
|
@ -11,7 +12,7 @@ import unittest
|
||||||
|
|
||||||
|
|
||||||
@util.case_insensitive_tests
|
@util.case_insensitive_tests
|
||||||
class CaseSensitivityTest(unittest.TestCase):
|
class CaseSensitivityTest:
|
||||||
|
|
||||||
"""PEP 235 dictates that on case-preserving, case-insensitive file systems
|
"""PEP 235 dictates that on case-preserving, case-insensitive file systems
|
||||||
that imports are case-sensitive unless the PYTHONCASEOK environment
|
that imports are case-sensitive unless the PYTHONCASEOK environment
|
||||||
|
@ -21,11 +22,11 @@ class CaseSensitivityTest(unittest.TestCase):
|
||||||
assert name != name.lower()
|
assert name != name.lower()
|
||||||
|
|
||||||
def find(self, path):
|
def find(self, path):
|
||||||
finder = machinery.FileFinder(path,
|
finder = self.machinery.FileFinder(path,
|
||||||
(machinery.SourceFileLoader,
|
(self.machinery.SourceFileLoader,
|
||||||
machinery.SOURCE_SUFFIXES),
|
self.machinery.SOURCE_SUFFIXES),
|
||||||
(machinery.SourcelessFileLoader,
|
(self.machinery.SourcelessFileLoader,
|
||||||
machinery.BYTECODE_SUFFIXES))
|
self.machinery.BYTECODE_SUFFIXES))
|
||||||
return finder.find_module(self.name)
|
return finder.find_module(self.name)
|
||||||
|
|
||||||
def sensitivity_test(self):
|
def sensitivity_test(self):
|
||||||
|
@ -41,7 +42,7 @@ class CaseSensitivityTest(unittest.TestCase):
|
||||||
def test_sensitive(self):
|
def test_sensitive(self):
|
||||||
with test_support.EnvironmentVarGuard() as env:
|
with test_support.EnvironmentVarGuard() as env:
|
||||||
env.unset('PYTHONCASEOK')
|
env.unset('PYTHONCASEOK')
|
||||||
if b'PYTHONCASEOK' in _bootstrap._os.environ:
|
if b'PYTHONCASEOK' in self.importlib._bootstrap._os.environ:
|
||||||
self.skipTest('os.environ changes not reflected in '
|
self.skipTest('os.environ changes not reflected in '
|
||||||
'_os.environ')
|
'_os.environ')
|
||||||
sensitive, insensitive = self.sensitivity_test()
|
sensitive, insensitive = self.sensitivity_test()
|
||||||
|
@ -52,7 +53,7 @@ class CaseSensitivityTest(unittest.TestCase):
|
||||||
def test_insensitive(self):
|
def test_insensitive(self):
|
||||||
with test_support.EnvironmentVarGuard() as env:
|
with test_support.EnvironmentVarGuard() as env:
|
||||||
env.set('PYTHONCASEOK', '1')
|
env.set('PYTHONCASEOK', '1')
|
||||||
if b'PYTHONCASEOK' not in _bootstrap._os.environ:
|
if b'PYTHONCASEOK' not in self.importlib._bootstrap._os.environ:
|
||||||
self.skipTest('os.environ changes not reflected in '
|
self.skipTest('os.environ changes not reflected in '
|
||||||
'_os.environ')
|
'_os.environ')
|
||||||
sensitive, insensitive = self.sensitivity_test()
|
sensitive, insensitive = self.sensitivity_test()
|
||||||
|
@ -61,10 +62,9 @@ class CaseSensitivityTest(unittest.TestCase):
|
||||||
self.assertTrue(hasattr(insensitive, 'load_module'))
|
self.assertTrue(hasattr(insensitive, 'load_module'))
|
||||||
self.assertIn(self.name, insensitive.get_filename(self.name))
|
self.assertIn(self.name, insensitive.get_filename(self.name))
|
||||||
|
|
||||||
|
Frozen_CaseSensitivityTest, Source_CaseSensitivityTest = util.test_both(
|
||||||
def test_main():
|
CaseSensitivityTest, importlib=importlib, machinery=machinery)
|
||||||
test_support.run_unittest(CaseSensitivityTest)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_main()
|
unittest.main()
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
from importlib import machinery
|
|
||||||
import importlib
|
|
||||||
import importlib.abc
|
|
||||||
import importlib.util
|
|
||||||
from .. import abc
|
from .. import abc
|
||||||
from .. import util
|
from .. import util
|
||||||
from . import util as source_util
|
from . import util as source_util
|
||||||
|
|
||||||
|
importlib = util.import_importlib('importlib')
|
||||||
|
importlib_abc = util.import_importlib('importlib.abc')
|
||||||
|
machinery = util.import_importlib('importlib.machinery')
|
||||||
|
importlib_util = util.import_importlib('importlib.util')
|
||||||
|
|
||||||
import errno
|
import errno
|
||||||
import marshal
|
import marshal
|
||||||
import os
|
import os
|
||||||
|
@ -19,7 +20,7 @@ import unittest
|
||||||
from test.support import make_legacy_pyc, unload
|
from test.support import make_legacy_pyc, unload
|
||||||
|
|
||||||
|
|
||||||
class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
class SimpleTest(abc.LoaderTests):
|
||||||
|
|
||||||
"""Should have no issue importing a source module [basic]. And if there is
|
"""Should have no issue importing a source module [basic]. And if there is
|
||||||
a syntax error, it should raise a SyntaxError [syntax error].
|
a syntax error, it should raise a SyntaxError [syntax error].
|
||||||
|
@ -27,7 +28,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def test_load_module_API(self):
|
def test_load_module_API(self):
|
||||||
class Tester(importlib.abc.FileLoader):
|
class Tester(self.abc.FileLoader):
|
||||||
def get_source(self, _): return 'attr = 42'
|
def get_source(self, _): return 'attr = 42'
|
||||||
def is_package(self, _): return False
|
def is_package(self, _): return False
|
||||||
|
|
||||||
|
@ -37,7 +38,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
|
|
||||||
def test_get_filename_API(self):
|
def test_get_filename_API(self):
|
||||||
# If fullname is not set then assume self.path is desired.
|
# If fullname is not set then assume self.path is desired.
|
||||||
class Tester(importlib.abc.FileLoader):
|
class Tester(self.abc.FileLoader):
|
||||||
def get_code(self, _): pass
|
def get_code(self, _): pass
|
||||||
def get_source(self, _): pass
|
def get_source(self, _): pass
|
||||||
def is_package(self, _): pass
|
def is_package(self, _): pass
|
||||||
|
@ -55,7 +56,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
# [basic]
|
# [basic]
|
||||||
def test_module(self):
|
def test_module(self):
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
|
loader = self.machinery.SourceFileLoader('_temp', mapping['_temp'])
|
||||||
module = loader.load_module('_temp')
|
module = loader.load_module('_temp')
|
||||||
self.assertIn('_temp', sys.modules)
|
self.assertIn('_temp', sys.modules)
|
||||||
check = {'__name__': '_temp', '__file__': mapping['_temp'],
|
check = {'__name__': '_temp', '__file__': mapping['_temp'],
|
||||||
|
@ -65,7 +66,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
|
|
||||||
def test_package(self):
|
def test_package(self):
|
||||||
with source_util.create_modules('_pkg.__init__') as mapping:
|
with source_util.create_modules('_pkg.__init__') as mapping:
|
||||||
loader = machinery.SourceFileLoader('_pkg',
|
loader = self.machinery.SourceFileLoader('_pkg',
|
||||||
mapping['_pkg.__init__'])
|
mapping['_pkg.__init__'])
|
||||||
module = loader.load_module('_pkg')
|
module = loader.load_module('_pkg')
|
||||||
self.assertIn('_pkg', sys.modules)
|
self.assertIn('_pkg', sys.modules)
|
||||||
|
@ -78,7 +79,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
|
|
||||||
def test_lacking_parent(self):
|
def test_lacking_parent(self):
|
||||||
with source_util.create_modules('_pkg.__init__', '_pkg.mod')as mapping:
|
with source_util.create_modules('_pkg.__init__', '_pkg.mod')as mapping:
|
||||||
loader = machinery.SourceFileLoader('_pkg.mod',
|
loader = self.machinery.SourceFileLoader('_pkg.mod',
|
||||||
mapping['_pkg.mod'])
|
mapping['_pkg.mod'])
|
||||||
module = loader.load_module('_pkg.mod')
|
module = loader.load_module('_pkg.mod')
|
||||||
self.assertIn('_pkg.mod', sys.modules)
|
self.assertIn('_pkg.mod', sys.modules)
|
||||||
|
@ -93,7 +94,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
|
|
||||||
def test_module_reuse(self):
|
def test_module_reuse(self):
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
|
loader = self.machinery.SourceFileLoader('_temp', mapping['_temp'])
|
||||||
module = loader.load_module('_temp')
|
module = loader.load_module('_temp')
|
||||||
module_id = id(module)
|
module_id = id(module)
|
||||||
module_dict_id = id(module.__dict__)
|
module_dict_id = id(module.__dict__)
|
||||||
|
@ -118,7 +119,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
setattr(orig_module, attr, value)
|
setattr(orig_module, attr, value)
|
||||||
with open(mapping[name], 'w') as file:
|
with open(mapping[name], 'w') as file:
|
||||||
file.write('+++ bad syntax +++')
|
file.write('+++ bad syntax +++')
|
||||||
loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
|
loader = self.machinery.SourceFileLoader('_temp', mapping['_temp'])
|
||||||
with self.assertRaises(SyntaxError):
|
with self.assertRaises(SyntaxError):
|
||||||
loader.load_module(name)
|
loader.load_module(name)
|
||||||
for attr in attributes:
|
for attr in attributes:
|
||||||
|
@ -129,7 +130,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
with open(mapping['_temp'], 'w') as file:
|
with open(mapping['_temp'], 'w') as file:
|
||||||
file.write('=')
|
file.write('=')
|
||||||
loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
|
loader = self.machinery.SourceFileLoader('_temp', mapping['_temp'])
|
||||||
with self.assertRaises(SyntaxError):
|
with self.assertRaises(SyntaxError):
|
||||||
loader.load_module('_temp')
|
loader.load_module('_temp')
|
||||||
self.assertNotIn('_temp', sys.modules)
|
self.assertNotIn('_temp', sys.modules)
|
||||||
|
@ -142,14 +143,14 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
file.write("# test file for importlib")
|
file.write("# test file for importlib")
|
||||||
try:
|
try:
|
||||||
with util.uncache('_temp'):
|
with util.uncache('_temp'):
|
||||||
loader = machinery.SourceFileLoader('_temp', file_path)
|
loader = self.machinery.SourceFileLoader('_temp', file_path)
|
||||||
mod = loader.load_module('_temp')
|
mod = loader.load_module('_temp')
|
||||||
self.assertEqual(file_path, mod.__file__)
|
self.assertEqual(file_path, mod.__file__)
|
||||||
self.assertEqual(importlib.util.cache_from_source(file_path),
|
self.assertEqual(self.util.cache_from_source(file_path),
|
||||||
mod.__cached__)
|
mod.__cached__)
|
||||||
finally:
|
finally:
|
||||||
os.unlink(file_path)
|
os.unlink(file_path)
|
||||||
pycache = os.path.dirname(importlib.util.cache_from_source(file_path))
|
pycache = os.path.dirname(self.util.cache_from_source(file_path))
|
||||||
if os.path.exists(pycache):
|
if os.path.exists(pycache):
|
||||||
shutil.rmtree(pycache)
|
shutil.rmtree(pycache)
|
||||||
|
|
||||||
|
@ -158,7 +159,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
# truncated rather than raise an OverflowError.
|
# truncated rather than raise an OverflowError.
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
source = mapping['_temp']
|
source = mapping['_temp']
|
||||||
compiled = importlib.util.cache_from_source(source)
|
compiled = self.util.cache_from_source(source)
|
||||||
with open(source, 'w') as f:
|
with open(source, 'w') as f:
|
||||||
f.write("x = 5")
|
f.write("x = 5")
|
||||||
try:
|
try:
|
||||||
|
@ -169,7 +170,7 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
if e.errno != getattr(errno, 'EOVERFLOW', None):
|
if e.errno != getattr(errno, 'EOVERFLOW', None):
|
||||||
raise
|
raise
|
||||||
self.skipTest("cannot set modification time to large integer ({})".format(e))
|
self.skipTest("cannot set modification time to large integer ({})".format(e))
|
||||||
loader = machinery.SourceFileLoader('_temp', mapping['_temp'])
|
loader = self.machinery.SourceFileLoader('_temp', mapping['_temp'])
|
||||||
mod = loader.load_module('_temp')
|
mod = loader.load_module('_temp')
|
||||||
# Sanity checks.
|
# Sanity checks.
|
||||||
self.assertEqual(mod.__cached__, compiled)
|
self.assertEqual(mod.__cached__, compiled)
|
||||||
|
@ -178,12 +179,16 @@ class SimpleTest(unittest.TestCase, abc.LoaderTests):
|
||||||
os.stat(compiled)
|
os.stat(compiled)
|
||||||
|
|
||||||
def test_unloadable(self):
|
def test_unloadable(self):
|
||||||
loader = machinery.SourceFileLoader('good name', {})
|
loader = self.machinery.SourceFileLoader('good name', {})
|
||||||
with self.assertRaises(ImportError):
|
with self.assertRaises(ImportError):
|
||||||
loader.load_module('bad name')
|
loader.load_module('bad name')
|
||||||
|
|
||||||
|
Frozen_SimpleTest, Source_SimpleTest = util.test_both(
|
||||||
|
SimpleTest, importlib=importlib, machinery=machinery, abc=importlib_abc,
|
||||||
|
util=importlib_util)
|
||||||
|
|
||||||
class BadBytecodeTest(unittest.TestCase):
|
|
||||||
|
class BadBytecodeTest:
|
||||||
|
|
||||||
def import_(self, file, module_name):
|
def import_(self, file, module_name):
|
||||||
loader = self.loader(module_name, file)
|
loader = self.loader(module_name, file)
|
||||||
|
@ -200,7 +205,7 @@ class BadBytecodeTest(unittest.TestCase):
|
||||||
pass
|
pass
|
||||||
py_compile.compile(mapping[name])
|
py_compile.compile(mapping[name])
|
||||||
if not del_source:
|
if not del_source:
|
||||||
bytecode_path = importlib.util.cache_from_source(mapping[name])
|
bytecode_path = self.util.cache_from_source(mapping[name])
|
||||||
else:
|
else:
|
||||||
os.unlink(mapping[name])
|
os.unlink(mapping[name])
|
||||||
bytecode_path = make_legacy_pyc(mapping[name])
|
bytecode_path = make_legacy_pyc(mapping[name])
|
||||||
|
@ -289,7 +294,9 @@ class BadBytecodeTest(unittest.TestCase):
|
||||||
|
|
||||||
class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
|
|
||||||
loader = machinery.SourceFileLoader
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
cls.loader = cls.machinery.SourceFileLoader
|
||||||
|
|
||||||
@source_util.writes_bytecode_files
|
@source_util.writes_bytecode_files
|
||||||
def test_empty_file(self):
|
def test_empty_file(self):
|
||||||
|
@ -329,7 +336,7 @@ class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
self.import_(mapping[name], name)
|
self.import_(mapping[name], name)
|
||||||
with open(bytecode_path, 'rb') as bytecode_file:
|
with open(bytecode_path, 'rb') as bytecode_file:
|
||||||
self.assertEqual(bytecode_file.read(4),
|
self.assertEqual(bytecode_file.read(4),
|
||||||
importlib.util.MAGIC_NUMBER)
|
self.util.MAGIC_NUMBER)
|
||||||
|
|
||||||
self._test_bad_magic(test)
|
self._test_bad_magic(test)
|
||||||
|
|
||||||
|
@ -379,13 +386,13 @@ class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
zeros = b'\x00\x00\x00\x00'
|
zeros = b'\x00\x00\x00\x00'
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
py_compile.compile(mapping['_temp'])
|
py_compile.compile(mapping['_temp'])
|
||||||
bytecode_path = importlib.util.cache_from_source(mapping['_temp'])
|
bytecode_path = self.util.cache_from_source(mapping['_temp'])
|
||||||
with open(bytecode_path, 'r+b') as bytecode_file:
|
with open(bytecode_path, 'r+b') as bytecode_file:
|
||||||
bytecode_file.seek(4)
|
bytecode_file.seek(4)
|
||||||
bytecode_file.write(zeros)
|
bytecode_file.write(zeros)
|
||||||
self.import_(mapping['_temp'], '_temp')
|
self.import_(mapping['_temp'], '_temp')
|
||||||
source_mtime = os.path.getmtime(mapping['_temp'])
|
source_mtime = os.path.getmtime(mapping['_temp'])
|
||||||
source_timestamp = importlib._w_long(source_mtime)
|
source_timestamp = self.importlib._w_long(source_mtime)
|
||||||
with open(bytecode_path, 'rb') as bytecode_file:
|
with open(bytecode_path, 'rb') as bytecode_file:
|
||||||
bytecode_file.seek(4)
|
bytecode_file.seek(4)
|
||||||
self.assertEqual(bytecode_file.read(4), source_timestamp)
|
self.assertEqual(bytecode_file.read(4), source_timestamp)
|
||||||
|
@ -397,7 +404,7 @@ class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
with source_util.create_modules('_temp') as mapping:
|
with source_util.create_modules('_temp') as mapping:
|
||||||
# Create bytecode that will need to be re-created.
|
# Create bytecode that will need to be re-created.
|
||||||
py_compile.compile(mapping['_temp'])
|
py_compile.compile(mapping['_temp'])
|
||||||
bytecode_path = importlib.util.cache_from_source(mapping['_temp'])
|
bytecode_path = self.util.cache_from_source(mapping['_temp'])
|
||||||
with open(bytecode_path, 'r+b') as bytecode_file:
|
with open(bytecode_path, 'r+b') as bytecode_file:
|
||||||
bytecode_file.seek(0)
|
bytecode_file.seek(0)
|
||||||
bytecode_file.write(b'\x00\x00\x00\x00')
|
bytecode_file.write(b'\x00\x00\x00\x00')
|
||||||
|
@ -411,10 +418,16 @@ class SourceLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
# Make writable for eventual clean-up.
|
# Make writable for eventual clean-up.
|
||||||
os.chmod(bytecode_path, stat.S_IWUSR)
|
os.chmod(bytecode_path, stat.S_IWUSR)
|
||||||
|
|
||||||
|
Frozen_SourceBadBytecode, Source_SourceBadBytecode = util.test_both(
|
||||||
|
SourceLoaderBadBytecodeTest, importlib=importlib, machinery=machinery,
|
||||||
|
abc=importlib_abc, util=importlib_util)
|
||||||
|
|
||||||
|
|
||||||
class SourcelessLoaderBadBytecodeTest(BadBytecodeTest):
|
class SourcelessLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
|
|
||||||
loader = machinery.SourcelessFileLoader
|
@classmethod
|
||||||
|
def setUpClass(cls):
|
||||||
|
cls.loader = cls.machinery.SourcelessFileLoader
|
||||||
|
|
||||||
def test_empty_file(self):
|
def test_empty_file(self):
|
||||||
def test(name, mapping, bytecode_path):
|
def test(name, mapping, bytecode_path):
|
||||||
|
@ -469,6 +482,9 @@ class SourcelessLoaderBadBytecodeTest(BadBytecodeTest):
|
||||||
def test_non_code_marshal(self):
|
def test_non_code_marshal(self):
|
||||||
self._test_non_code_marshal(del_source=True)
|
self._test_non_code_marshal(del_source=True)
|
||||||
|
|
||||||
|
Frozen_SourcelessBadBytecode, Source_SourcelessBadBytecode = util.test_both(
|
||||||
|
SourcelessLoaderBadBytecodeTest, importlib=importlib,
|
||||||
|
machinery=machinery, abc=importlib_abc, util=importlib_util)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
from .. import abc
|
from .. import abc
|
||||||
|
from .. import util
|
||||||
from . import util as source_util
|
from . import util as source_util
|
||||||
|
|
||||||
from importlib import machinery
|
machinery = util.import_importlib('importlib.machinery')
|
||||||
|
|
||||||
import errno
|
import errno
|
||||||
import os
|
import os
|
||||||
import py_compile
|
import py_compile
|
||||||
|
@ -13,7 +15,7 @@ import unittest
|
||||||
import warnings
|
import warnings
|
||||||
|
|
||||||
|
|
||||||
class FinderTests(unittest.TestCase, abc.FinderTests):
|
class FinderTests(abc.FinderTests):
|
||||||
|
|
||||||
"""For a top-level module, it should just be found directly in the
|
"""For a top-level module, it should just be found directly in the
|
||||||
directory being searched. This is true for a directory with source
|
directory being searched. This is true for a directory with source
|
||||||
|
@ -38,11 +40,11 @@ class FinderTests(unittest.TestCase, abc.FinderTests):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def get_finder(self, root):
|
def get_finder(self, root):
|
||||||
loader_details = [(machinery.SourceFileLoader,
|
loader_details = [(self.machinery.SourceFileLoader,
|
||||||
machinery.SOURCE_SUFFIXES),
|
self.machinery.SOURCE_SUFFIXES),
|
||||||
(machinery.SourcelessFileLoader,
|
(self.machinery.SourcelessFileLoader,
|
||||||
machinery.BYTECODE_SUFFIXES)]
|
self.machinery.BYTECODE_SUFFIXES)]
|
||||||
return machinery.FileFinder(root, *loader_details)
|
return self.machinery.FileFinder(root, *loader_details)
|
||||||
|
|
||||||
def import_(self, root, module):
|
def import_(self, root, module):
|
||||||
return self.get_finder(root).find_module(module)
|
return self.get_finder(root).find_module(module)
|
||||||
|
@ -123,8 +125,8 @@ class FinderTests(unittest.TestCase, abc.FinderTests):
|
||||||
|
|
||||||
def test_empty_string_for_dir(self):
|
def test_empty_string_for_dir(self):
|
||||||
# The empty string from sys.path means to search in the cwd.
|
# The empty string from sys.path means to search in the cwd.
|
||||||
finder = machinery.FileFinder('', (machinery.SourceFileLoader,
|
finder = self.machinery.FileFinder('', (self.machinery.SourceFileLoader,
|
||||||
machinery.SOURCE_SUFFIXES))
|
self.machinery.SOURCE_SUFFIXES))
|
||||||
with open('mod.py', 'w') as file:
|
with open('mod.py', 'w') as file:
|
||||||
file.write("# test file for importlib")
|
file.write("# test file for importlib")
|
||||||
try:
|
try:
|
||||||
|
@ -135,8 +137,8 @@ class FinderTests(unittest.TestCase, abc.FinderTests):
|
||||||
|
|
||||||
def test_invalidate_caches(self):
|
def test_invalidate_caches(self):
|
||||||
# invalidate_caches() should reset the mtime.
|
# invalidate_caches() should reset the mtime.
|
||||||
finder = machinery.FileFinder('', (machinery.SourceFileLoader,
|
finder = self.machinery.FileFinder('', (self.machinery.SourceFileLoader,
|
||||||
machinery.SOURCE_SUFFIXES))
|
self.machinery.SOURCE_SUFFIXES))
|
||||||
finder._path_mtime = 42
|
finder._path_mtime = 42
|
||||||
finder.invalidate_caches()
|
finder.invalidate_caches()
|
||||||
self.assertEqual(finder._path_mtime, -1)
|
self.assertEqual(finder._path_mtime, -1)
|
||||||
|
@ -180,11 +182,9 @@ class FinderTests(unittest.TestCase, abc.FinderTests):
|
||||||
finder = self.get_finder(file_obj.name)
|
finder = self.get_finder(file_obj.name)
|
||||||
self.assertEqual((None, []), finder.find_loader('doesnotexist'))
|
self.assertEqual((None, []), finder.find_loader('doesnotexist'))
|
||||||
|
|
||||||
|
Frozen_FinderTests, Source_FinderTests = util.test_both(FinderTests, machinery=machinery)
|
||||||
|
|
||||||
def test_main():
|
|
||||||
from test.support import run_unittest
|
|
||||||
run_unittest(FinderTests)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_main()
|
unittest.main()
|
||||||
|
|
|
@ -1,16 +1,18 @@
|
||||||
|
from .. import util
|
||||||
from . import util as source_util
|
from . import util as source_util
|
||||||
|
|
||||||
from importlib import machinery
|
machinery = util.import_importlib('importlib.machinery')
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
|
|
||||||
class PathHookTest(unittest.TestCase):
|
class PathHookTest:
|
||||||
|
|
||||||
"""Test the path hook for source."""
|
"""Test the path hook for source."""
|
||||||
|
|
||||||
def path_hook(self):
|
def path_hook(self):
|
||||||
return machinery.FileFinder.path_hook((machinery.SourceFileLoader,
|
return self.machinery.FileFinder.path_hook((self.machinery.SourceFileLoader,
|
||||||
machinery.SOURCE_SUFFIXES))
|
self.machinery.SOURCE_SUFFIXES))
|
||||||
|
|
||||||
def test_success(self):
|
def test_success(self):
|
||||||
with source_util.create_modules('dummy') as mapping:
|
with source_util.create_modules('dummy') as mapping:
|
||||||
|
@ -21,11 +23,8 @@ class PathHookTest(unittest.TestCase):
|
||||||
# The empty string represents the cwd.
|
# The empty string represents the cwd.
|
||||||
self.assertTrue(hasattr(self.path_hook()(''), 'find_module'))
|
self.assertTrue(hasattr(self.path_hook()(''), 'find_module'))
|
||||||
|
|
||||||
|
Frozen_PathHookTest, Source_PathHooktest = util.test_both(PathHookTest, machinery=machinery)
|
||||||
def test_main():
|
|
||||||
from test.support import run_unittest
|
|
||||||
run_unittest(PathHookTest)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_main()
|
unittest.main()
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
|
from .. import util
|
||||||
from . import util as source_util
|
from . import util as source_util
|
||||||
|
|
||||||
from importlib import _bootstrap
|
machinery = util.import_importlib('importlib.machinery')
|
||||||
|
|
||||||
import codecs
|
import codecs
|
||||||
import re
|
import re
|
||||||
import sys
|
import sys
|
||||||
|
@ -13,7 +15,7 @@ import unittest
|
||||||
CODING_RE = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)', re.ASCII)
|
CODING_RE = re.compile(r'^[ \t\f]*#.*coding[:=][ \t]*([-\w.]+)', re.ASCII)
|
||||||
|
|
||||||
|
|
||||||
class EncodingTest(unittest.TestCase):
|
class EncodingTest:
|
||||||
|
|
||||||
"""PEP 3120 makes UTF-8 the default encoding for source code
|
"""PEP 3120 makes UTF-8 the default encoding for source code
|
||||||
[default encoding].
|
[default encoding].
|
||||||
|
@ -35,7 +37,7 @@ class EncodingTest(unittest.TestCase):
|
||||||
with source_util.create_modules(self.module_name) as mapping:
|
with source_util.create_modules(self.module_name) as mapping:
|
||||||
with open(mapping[self.module_name], 'wb') as file:
|
with open(mapping[self.module_name], 'wb') as file:
|
||||||
file.write(source)
|
file.write(source)
|
||||||
loader = _bootstrap.SourceFileLoader(self.module_name,
|
loader = self.machinery.SourceFileLoader(self.module_name,
|
||||||
mapping[self.module_name])
|
mapping[self.module_name])
|
||||||
return loader.load_module(self.module_name)
|
return loader.load_module(self.module_name)
|
||||||
|
|
||||||
|
@ -84,8 +86,10 @@ class EncodingTest(unittest.TestCase):
|
||||||
with self.assertRaises(SyntaxError):
|
with self.assertRaises(SyntaxError):
|
||||||
self.run_test(source)
|
self.run_test(source)
|
||||||
|
|
||||||
|
Frozen_EncodingTest, Source_EncodingTest = util.test_both(EncodingTest, machinery=machinery)
|
||||||
|
|
||||||
class LineEndingTest(unittest.TestCase):
|
|
||||||
|
class LineEndingTest:
|
||||||
|
|
||||||
r"""Source written with the three types of line endings (\n, \r\n, \r)
|
r"""Source written with the three types of line endings (\n, \r\n, \r)
|
||||||
need to be readable [cr][crlf][lf]."""
|
need to be readable [cr][crlf][lf]."""
|
||||||
|
@ -97,7 +101,7 @@ class LineEndingTest(unittest.TestCase):
|
||||||
with source_util.create_modules(module_name) as mapping:
|
with source_util.create_modules(module_name) as mapping:
|
||||||
with open(mapping[module_name], 'wb') as file:
|
with open(mapping[module_name], 'wb') as file:
|
||||||
file.write(source)
|
file.write(source)
|
||||||
loader = _bootstrap.SourceFileLoader(module_name,
|
loader = self.machinery.SourceFileLoader(module_name,
|
||||||
mapping[module_name])
|
mapping[module_name])
|
||||||
return loader.load_module(module_name)
|
return loader.load_module(module_name)
|
||||||
|
|
||||||
|
@ -113,11 +117,9 @@ class LineEndingTest(unittest.TestCase):
|
||||||
def test_lf(self):
|
def test_lf(self):
|
||||||
self.run_test(b'\n')
|
self.run_test(b'\n')
|
||||||
|
|
||||||
|
Frozen_LineEndings, Source_LineEndings = util.test_both(LineEndingTest, machinery=machinery)
|
||||||
|
|
||||||
def test_main():
|
|
||||||
from test.support import run_unittest
|
|
||||||
run_unittest(EncodingTest, LineEndingTest)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
test_main()
|
unittest.main()
|
||||||
|
|
Loading…
Reference in New Issue