Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-10 02:21:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Tweak the handling of the empty string in sys.path for importlib.

Browse source 
It seems better to cache the finder for the cwd under its full path
insetad of '' in case the cwd changes. Otherwise FileFinder needs to
dynamically change itself based on whether it is given '' instead of
caching a finder for every change to the cwd.
This commit is contained in:
Brett Cannon 2012-02-16 18:12:00 -05:00
parent 22e7c88057
commit f58d45c649
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/importlib/_bootstrap.py
View file

@ -713,10 +713,12 @@ def _path_importer_cache(cls, path, default=None):
the default hook, for which ImportError is raised. the default hook, for which ImportError is raised.
""" """
if path == '':
path = _os.getcwd()
try: try:
finder = sys.path_importer_cache[path] finder = sys.path_importer_cache[path]
except KeyError: except KeyError:
finder = cls._path_hooks(path if path != '' else _os.getcwd()) finder = cls._path_hooks(path)
sys.path_importer_cache[path] = finder sys.path_importer_cache[path] = finder
else: else:
if finder is None and default: if finder is None and default:

2
Lib/importlib/test/import_/test_path.py
View file

@ -82,7 +82,7 @@ def test_path_importer_cache_empty_string(self):
with util.import_state(path=[path], path_hooks=[hook]): with util.import_state(path=[path], path_hooks=[hook]):
loader = machinery.PathFinder.find_module(module) loader = machinery.PathFinder.find_module(module)
self.assertIs(loader, importer) self.assertIs(loader, importer)
self.assertIn('', sys.path_importer_cache) self.assertIn(os.getcwd(), sys.path_importer_cache)
class DefaultPathFinderTests(unittest.TestCase): class DefaultPathFinderTests(unittest.TestCase):