diff options
| author | Brett Cannon <brett@python.org> | 2013-10-18 15:39:04 (GMT) |
|---|---|---|
| committer | Brett Cannon <brett@python.org> | 2013-10-18 15:39:04 (GMT) |
| commit | 27e27f7ee1f366e52cfd576b427e923190b6202e (patch) | |
| tree | 895d1caeba83a4151556fdb06fcad6141bd49f12 /Lib/importlib | |
| parent | 40b22d0661c45ac350a7252a32ef665b81b1643c (diff) | |
| download | cpython-27e27f7ee1f366e52cfd576b427e923190b6202e.zip cpython-27e27f7ee1f366e52cfd576b427e923190b6202e.tar.gz cpython-27e27f7ee1f366e52cfd576b427e923190b6202e.tar.bz2 | |
Issue #18416: Have importlib.machinery.PathFinder treat '' as the cwd
and stop importlib.machinery.FileFinder treating '' as '.'.
Previous PathFinder transformed '' into '.' which led to __file__ for
modules imported from the cwd to always be relative paths. This meant
the values of the attribute were wrong as soon as the cwd changed.
This change now means that as long as the site module is run (which
makes all entries in sys.path absolute) then all values for __file__
will also be absolute unless it's for __main__ when specified by file
path in a relative way (modules imported by runpy will have an
absolute path).
Now that PathFinder is no longer treating '' as '.' it only makes
sense for FileFinder to stop doing so as well. Now no transformation
is performed for the directory given to the __init__ method.
Thanks to Madison May for the initial patch.
Diffstat (limited to 'Lib/importlib')
| -rw-r--r-- | Lib/importlib/_bootstrap.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index a95d8b6..bc1ee05 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -1302,7 +1302,7 @@ class PathFinder: """ if path == '': - path = '.' + path = _os.getcwd() try: finder = sys.path_importer_cache[path] except KeyError: @@ -1373,7 +1373,7 @@ class FileFinder: loaders.extend((suffix, loader) for suffix in suffixes) self._loaders = loaders # Base (directory) path - self.path = path or '.' + self.path = path self._path_mtime = -1 self._path_cache = set() self._relaxed_path_cache = set() |