From f58d45c649c1738870ac85887599850fd2bbf157 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Thu, 16 Feb 2012 18:12:00 -0500 Subject: Tweak the handling of the empty string in sys.path for importlib. 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. --- Lib/importlib/_bootstrap.py | 4 +++- Lib/importlib/test/import_/test_path.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 44349a8..39cf76a 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -713,10 +713,12 @@ class PathFinder: the default hook, for which ImportError is raised. """ + if path == '': + path = _os.getcwd() try: finder = sys.path_importer_cache[path] except KeyError: - finder = cls._path_hooks(path if path != '' else _os.getcwd()) + finder = cls._path_hooks(path) sys.path_importer_cache[path] = finder else: if finder is None and default: diff --git a/Lib/importlib/test/import_/test_path.py b/Lib/importlib/test/import_/test_path.py index b28f25d..61fe226 100644 --- a/Lib/importlib/test/import_/test_path.py +++ b/Lib/importlib/test/import_/test_path.py @@ -82,7 +82,7 @@ class FinderTests(unittest.TestCase): with util.import_state(path=[path], path_hooks=[hook]): loader = machinery.PathFinder.find_module(module) self.assertIs(loader, importer) - self.assertIn('', sys.path_importer_cache) + self.assertIn(os.getcwd(), sys.path_importer_cache) class DefaultPathFinderTests(unittest.TestCase): -- cgit v0.12