Merge 3.2

This commit is contained in:
Éric Araujo 2011-11-29 17:14:27 +01:00
commit c8e032006a
11 changed files with 37 additions and 16 deletions

View file

@ -482,7 +482,7 @@ def getmodule(object, _filename=None):
return sys.modules.get(modulesbyfile[file])
# Update the filename to module name cache and check yet again
# Copy sys.modules in order to cope with changes while iterating
for modname, module in sys.modules.items():
for modname, module in list(sys.modules.items()):
if ismodule(module) and hasattr(module, '__file__'):
f = module.__file__
if f == _filesbymodname.get(modname, None):