mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Remove dead PEP 451 code.

Browse source
This commit is contained in:
Eric Snow 2014-01-06 20:38:16 -07:00
parent 3845521b4b
commit 3192eac6cf
2 changed files with 0 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/importlib/_bootstrap.py
View file

@ -1183,15 +1183,6 @@ class _SpecMethods:
pass pass
return module return module
# XXX If we don't end up using this for pythonrun.c/runpy, we should
# get rid of it.
def _load_existing(self, module):
"""Exec the spec'ed module into an existing module's namespace."""
# For use by runpy.
with _installed_safely(module):
loaded = self.exec(module)
return loaded
def _load_unlocked(self): def _load_unlocked(self):
# A helper for direct use by the import system. # A helper for direct use by the import system.
if self.spec.loader is not None: if self.spec.loader is not None:
@ -1389,7 +1380,6 @@ class WindowsRegistryFinder:
@classmethod @classmethod
def find_spec(cls, fullname, path=None, target=None): def find_spec(cls, fullname, path=None, target=None):
# XXX untested! Need a Windows person to write tests (otherwise mock out appropriately)
filepath = cls._search_registry(fullname) filepath = cls._search_registry(fullname)
if filepath is None: if filepath is None:
return None return None

12
Lib/test/test_importlib/test_spec.py
View file

@ -437,18 +437,6 @@ class ModuleSpecMethodsTests:
loaded = self.bootstrap._SpecMethods(self.spec).load() loaded = self.bootstrap._SpecMethods(self.spec).load()
self.assertNotIn(self.spec.name, sys.modules) self.assertNotIn(self.spec.name, sys.modules)
def test_load_existing(self):
existing = type(sys)('ham')
existing.count = 5
self.spec.loader = NewLoader()
with CleanImport(self.name):
sys.modules[self.name] = existing
assert self.spec.name == self.name
loaded = self.bootstrap._SpecMethods(self.spec).load()
self.assertEqual(loaded.eggs, 1)
self.assertFalse(hasattr(loaded, 'ham'))
def test_load_legacy(self): def test_load_legacy(self):
self.spec.loader = LegacyLoader() self.spec.loader = LegacyLoader()
with CleanImport(self.spec.name): with CleanImport(self.spec.name):