Mercurial > cpython-lru_cache-weakref

diff Lib/importlib/_bootstrap.py @ 86438:33844153cd02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Issue #18416: Fix various os calls in importlib.machinery.FileFinder now that self.path is no longer forced to '.'.
author Brett Cannon <brett@python.org>
date Fri, 18 Oct 2013 12:01:06 -0400
parents 76184b5339f2
children 11f2f4af1979
line wrap: on
line diff
--- a/Lib/importlib/_bootstrap.py	Fri Oct 18 11:39:32 2013 -0400
+++ b/Lib/importlib/_bootstrap.py	Fri Oct 18 12:01:06 2013 -0400
@@ -1390,7 +1390,7 @@
         is_namespace = False
         tail_module = fullname.rpartition('.')[2]
         try:
-            mtime = _os.stat(self.path).st_mtime
+            mtime = _os.stat(self.path or _os.getcwd()).st_mtime
         except OSError:
             mtime = -1
         if mtime != self._path_mtime:
@@ -1432,7 +1432,7 @@
         """Fill the cache of potential modules and packages for this directory."""
         path = self.path
         try:
-            contents = _os.listdir(path)
+            contents = _os.listdir(path or _os.getcwd())
         except (FileNotFoundError, PermissionError, NotADirectoryError):
             # Directory has either been removed, turned into a file, or made
             # unreadable.