Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit cdf6012

Browse files
ericsnowcurrentlyericsnowcurrently
committed
Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules.
1 parent dcdd05b commit cdf6012

5 files changed

Lines changed: 642 additions & 507 deletions

File tree

‎Lib/importlib/__init__.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def reload(module):
107107
if not module or not isinstance(module, types.ModuleType):
108108
raise TypeError("reload() argument must be module")
109109
name = module.__name__
110-
if name not in sys.modules:
110+
if sys.modules.get(name) is not module:
111111
msg = "module {} not in sys.modules"
112112
raise ImportError(msg.format(name), name=name)
113113
if name in _RELOADING:
@@ -118,7 +118,11 @@ def reload(module):
118118
if parent_name and parent_name not in sys.modules:
119119
msg = "parent {!r} not in sys.modules"
120120
raise ImportError(msg.format(parent_name), name=parent_name)
121-
module.__loader__.load_module(name)
121+
loader = _bootstrap._find_module(name, None)
122+
if loader is None:
123+
raise ImportError(_bootstrap._ERR_MSG.format(name), name=name)
124+
module.__loader__ = loader
125+
loader.load_module(name)
122126
# The module may have replaced itself in sys.modules!
123127
return sys.modules[module.__name__]
124128
finally:

‎Lib/importlib/_bootstrap.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1510,15 +1510,19 @@ def _find_module(name, path):
15101510
"""Find a module's loader."""
15111511
if not sys.meta_path:
15121512
_warnings.warn('sys.meta_path is empty', ImportWarning)
1513+
is_reload = name in sys.modules
15131514
for finder in sys.meta_path:
15141515
with _ImportLockContext():
15151516
loader = finder.find_module(name, path)
15161517
if loader is not None:
15171518
# The parent import may have already imported this module.
1518-
if name not in sys.modules:
1519+
if is_reload or name not in sys.modules:
15191520
return loader
15201521
else:
1521-
return sys.modules[name].__loader__
1522+
try:
1523+
return sys.modules[name].__loader__
1524+
except AttributeError:
1525+
return loader
15221526
else:
15231527
return None
15241528

‎Lib/test/test_importlib/test_api.py‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
from . import util
22

33
frozen_init, source_init = util.import_importlib('importlib')
4+
frozen_util, source_util = util.import_importlib('importlib.util')
45
frozen_machinery, source_machinery = util.import_importlib('importlib.machinery')
56

7+
import os.path
68
import sys
79
from test import support
810
import types
@@ -190,11 +192,129 @@ def code():
190192
self.assertEqual(actual.spam, 3)
191193
self.assertEqual(reloaded.spam, 3)
192194

195+
def test_reload_missing_loader(self):
196+
with support.CleanImport('types'):
197+
import types
198+
loader = types.__loader__
199+
del types.__loader__
200+
reloaded = self.init.reload(types)
201+
202+
self.assertIs(reloaded, types)
203+
self.assertIs(sys.modules['types'], types)
204+
self.assertEqual(reloaded.__loader__.path, loader.path)
205+
206+
def test_reload_loader_replaced(self):
207+
with support.CleanImport('types'):
208+
import types
209+
types.__loader__ = None
210+
self.init.invalidate_caches()
211+
reloaded = self.init.reload(types)
212+
213+
self.assertIsNot(reloaded.__loader__, None)
214+
self.assertIs(reloaded, types)
215+
self.assertIs(sys.modules['types'], types)
216+
217+
def test_reload_location_changed(self):
218+
name = 'spam'
219+
with support.temp_cwd(None) as cwd:
220+
with util.uncache('spam'):
221+
with support.DirsOnSysPath(cwd):
222+
self.init.invalidate_caches()
223+
path = os.path.join(cwd, name + '.py')
224+
cached = self.util.cache_from_source(path)
225+
expected = {'__name__': name,
226+
'__package__': '',
227+
'__file__': path,
228+
'__cached__': cached,
229+
'__doc__': None,
230+
'__builtins__': __builtins__,
231+
}
232+
support.create_empty_file(path)
233+
module = self.init.import_module(name)
234+
ns = vars(module)
235+
del ns['__initializing__']
236+
loader = ns.pop('__loader__')
237+
self.assertEqual(loader.path, path)
238+
self.assertEqual(ns, expected)
239+
240+
self.init.invalidate_caches()
241+
init_path = os.path.join(cwd, name, '__init__.py')
242+
cached = self.util.cache_from_source(init_path)
243+
expected = {'__name__': name,
244+
'__package__': name,
245+
'__file__': init_path,
246+
'__cached__': cached,
247+
'__path__': [os.path.dirname(init_path)],
248+
'__doc__': None,
249+
'__builtins__': __builtins__,
250+
}
251+
os.mkdir(name)
252+
os.rename(path, init_path)
253+
reloaded = self.init.reload(module)
254+
ns = vars(reloaded)
255+
del ns['__initializing__']
256+
loader = ns.pop('__loader__')
257+
self.assertIs(reloaded, module)
258+
self.assertEqual(loader.path, init_path)
259+
self.assertEqual(ns, expected)
260+
261+
def test_reload_namespace_changed(self):
262+
self.maxDiff = None
263+
name = 'spam'
264+
with support.temp_cwd(None) as cwd:
265+
with util.uncache('spam'):
266+
with support.DirsOnSysPath(cwd):
267+
self.init.invalidate_caches()
268+
bad_path = os.path.join(cwd, name, '__init.py')
269+
cached = self.util.cache_from_source(bad_path)
270+
expected = {'__name__': name,
271+
'__package__': name,
272+
'__doc__': None,
273+
}
274+
os.mkdir(name)
275+
with open(bad_path, 'w') as init_file:
276+
init_file.write('eggs = None')
277+
module = self.init.import_module(name)
278+
ns = vars(module)
279+
del ns['__initializing__']
280+
loader = ns.pop('__loader__')
281+
path = ns.pop('__path__')
282+
self.assertEqual(list(path),
283+
[os.path.dirname(bad_path)] * 2)
284+
with self.assertRaises(AttributeError):
285+
# a NamespaceLoader
286+
loader.path
287+
self.assertEqual(ns, expected)
288+
289+
self.init.invalidate_caches()
290+
init_path = os.path.join(cwd, name, '__init__.py')
291+
cached = self.util.cache_from_source(init_path)
292+
expected = {'__name__': name,
293+
'__package__': name,
294+
'__file__': init_path,
295+
'__cached__': cached,
296+
'__path__': [os.path.dirname(init_path)],
297+
'__doc__': None,
298+
'__builtins__': __builtins__,
299+
'eggs': None,
300+
}
301+
os.rename(bad_path, init_path)
302+
reloaded = self.init.reload(module)
303+
ns = vars(reloaded)
304+
del ns['__initializing__']
305+
loader = ns.pop('__loader__')
306+
self.assertIs(reloaded, module)
307+
self.assertEqual(loader.path, init_path)
308+
self.assertEqual(ns, expected)
309+
310+
193311
class Frozen_ReloadTests(ReloadTests, unittest.TestCase):
194312
init = frozen_init
313+
util = frozen_util
195314

196315
class Source_ReloadTests(ReloadTests, unittest.TestCase):
197316
init = source_init
317+
util = source_util
198318

199319

200320
class InvalidateCacheTests:

‎Misc/NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ Library
127127
- Issue #8964: fix platform._sys_version to handle IronPython 2.6+.
128128
Patch by Martin Matusiak.
129129

130+
- Issue #19413: Restore pre-3.3 reload() semantics of re-finding modules.
131+
130132
- Issue #18958: Improve error message for json.load(s) while passing a string
131133
that starts with a UTF-8 BOM.
132134

0 commit comments

Comments
 (0)