openstack/os-ken
Code Issues Proposed changes

import_module: deal with cases mod.__file__ is not accessible

Browse Source 
Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
YAMAMOTO Takashi 2013-09-11 16:53:25 +09:00 committed by FUJITA Tomonori
parent 9bfef0317b
commit dd06396803
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ryu/utils.py
View File

@ -47,8 +47,12 @@ def chop_py_suffix(p):
def _likely_same(a, b):
if os.path.samefile(a, b):
return True
try:
if os.path.samefile(a, b):
return True
except OSError:
# m.__file__ is not always accessible. eg. egg
return False
if chop_py_suffix(a) == chop_py_suffix(b):
return True
return False
@ -57,6 +61,8 @@ def _likely_same(a, b):
def _find_loaded_module(modpath):
# copy() to avoid RuntimeError: dictionary changed size during iteration
for k, m in sys.modules.copy().iteritems():
if k == '__main__':
continue
if not hasattr(m, '__file__'):
continue
if _likely_same(m.__file__, modpath):