mirror of
https://github.com/python/cpython.git
synced 2025-09-18 22:50:26 +00:00
Merge from 3.5
This commit is contained in:
commit
da037616b1
2 changed files with 14 additions and 4 deletions
|
@ -1,6 +1,8 @@
|
||||||
import importlib
|
import importlib
|
||||||
from importlib import abc
|
from importlib import abc
|
||||||
from importlib import util
|
from importlib import util
|
||||||
|
import sys
|
||||||
|
import types
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
from . import util as test_util
|
from . import util as test_util
|
||||||
|
@ -122,10 +124,18 @@ class LazyLoaderTests(unittest.TestCase):
|
||||||
self.assertFalse(hasattr(module, '__name__'))
|
self.assertFalse(hasattr(module, '__name__'))
|
||||||
|
|
||||||
def test_module_substitution_error(self):
|
def test_module_substitution_error(self):
|
||||||
source_code = 'import sys; sys.modules[__name__] = 42'
|
|
||||||
module = self.new_module(source_code)
|
|
||||||
with test_util.uncache(TestingImporter.module_name):
|
with test_util.uncache(TestingImporter.module_name):
|
||||||
with self.assertRaises(ValueError):
|
fresh_module = types.ModuleType(TestingImporter.module_name)
|
||||||
|
sys.modules[TestingImporter.module_name] = fresh_module
|
||||||
|
module = self.new_module()
|
||||||
|
with self.assertRaisesRegex(ValueError, "substituted"):
|
||||||
|
module.__name__
|
||||||
|
|
||||||
|
def test_module_already_in_sys(self):
|
||||||
|
with test_util.uncache(TestingImporter.module_name):
|
||||||
|
module = self.new_module()
|
||||||
|
sys.modules[TestingImporter.module_name] = module
|
||||||
|
# Force the load; just care that no exception is raised.
|
||||||
module.__name__
|
module.__name__
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue