mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Issue #14063: fix test_importlib failure under OS X case-insensitive filesystems

Browse source 
(regression)
This commit is contained in:
Antoine Pitrou 2012-02-20 22:06:59 +01:00
parent 6ddac006be
commit b5c793a0b3
1 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Lib/importlib/_bootstrap.py
View file

@ -762,13 +762,12 @@ class _FileFinder:
self.path = path or '.' self.path = path or '.'
self._path_mtime = -1 self._path_mtime = -1
self._path_cache = set() self._path_cache = set()
self._relaxed_path_cache = set()
self._cache_refresh = 0 self._cache_refresh = 0
def find_module(self, fullname): def find_module(self, fullname):
"""Try to find a loader for the specified module.""" """Try to find a loader for the specified module."""
tail_module = fullname.rpartition('.')[2] tail_module = fullname.rpartition('.')[2]
if _relax_case():
tail_module = tail_module.lower()
try: try:
mtime = _os.stat(self.path).st_mtime mtime = _os.stat(self.path).st_mtime
except OSError: except OSError:
@ -777,8 +776,14 @@ class _FileFinder:
self._fill_cache() self._fill_cache()
self._path_mtime = mtime self._path_mtime = mtime
self._cache_refresh = _cache_refresh self._cache_refresh = _cache_refresh
# tail_module keeps the original casing, for __file__ and friends
if _relax_case():
cache = self._relaxed_path_cache
cache_module = tail_module.lower()
else:
cache = self._path_cache cache = self._path_cache
if tail_module in cache: cache_module = tail_module
if cache_module in cache:
base_path = _path_join(self.path, tail_module) base_path = _path_join(self.path, tail_module)
if _path_isdir(base_path): if _path_isdir(base_path):
for suffix, loader in self.packages: for suffix, loader in self.packages:
@ -790,9 +795,8 @@ class _FileFinder:
msg = "Not importing directory {}: missing __init__" msg = "Not importing directory {}: missing __init__"
_warnings.warn(msg.format(base_path), ImportWarning) _warnings.warn(msg.format(base_path), ImportWarning)
for suffix, loader in self.modules: for suffix, loader in self.modules:
mod_filename = tail_module + suffix if cache_module + suffix in cache:
if mod_filename in cache: full_path = _path_join(self.path, tail_module + suffix)
full_path = _path_join(self.path, mod_filename)
if _path_isfile(full_path): if _path_isfile(full_path):
return loader(fullname, full_path) return loader(fullname, full_path)
return None return None
@ -801,10 +805,10 @@ class _FileFinder:
"""Fill the cache of potential modules and packages for this directory.""" """Fill the cache of potential modules and packages for this directory."""
path = self.path path = self.path
contents = _os.listdir(path) contents = _os.listdir(path)
if _relax_case(): # We store two cached versions, to handle runtime changes of the
self._path_cache = set(fn.lower() for fn in contents) # PYTHONCASEOK environment variable.
else:
self._path_cache = set(contents) self._path_cache = set(contents)
self._relaxed_path_cache = set(fn.lower() for fn in contents)
class _SourceFinderDetails: class _SourceFinderDetails: