diff options
| author | Brett Cannon <brett@python.org> | 2012-02-16 23:12:00 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2012-02-16 23:12:00 (GMT) |
| commit | f58d45c649c1738870ac85887599850fd2bbf157 (patch) | |
| tree | c16b0f2c43c52dd82c5468d11747bb515fc91416 /Lib/importlib/_bootstrap.py | |
| parent | 22e7c88057ee91ded2bd9853a6b67846c34d392f (diff) | |
| download | cpython-f58d45c649c1738870ac85887599850fd2bbf157.zip cpython-f58d45c649c1738870ac85887599850fd2bbf157.tar.gz cpython-f58d45c649c1738870ac85887599850fd2bbf157.tar.bz2 | |
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.
Diffstat (limited to 'Lib/importlib/_bootstrap.py')
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 4 |
1 files changed, 3 insertions, 1 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: |