openstack/os-ken
Code Issues Proposed changes

utils: fix for temporarily storing the value of sys.path

Browse Source 
Currentry, the *reference* of sys.path is temporarily stored before
appending a path to the user modules.
However, the *value* of sys.path should be stored because the type
of sys.path is list (mutable object) type.

Reported-by: Xandaros <mz.bremerhaven@gmail.com>
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2016-05-10 13:58:03 +09:00 committed by FUJITA Tomonori
parent 2d05aedf14
commit c66b4b34e5
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ryu/utils.py
View File

@ -30,7 +30,7 @@
# under the License.
import inspect
import importlib
import logging
import os
import sys
@ -77,21 +77,27 @@ def _find_loaded_module(modpath):
def import_module(modname):
try:
__import__(modname)
except:
# Import module with python module path
# e.g.) modname = 'module.path.module_name'
return importlib.import_module(modname)
except (ImportError, TypeError):
# In this block, we retry to import module when modname is filename
# e.g.) modname = 'module/path/module_name.py'
abspath = os.path.abspath(modname)
# Check if specified modname is already imported
mod = _find_loaded_module(abspath)
if mod:
return mod
opath = sys.path
# Backup original sys.path before appending path to file
original_path = list(sys.path)
sys.path.append(os.path.dirname(abspath))
name = os.path.basename(modname)
if name.endswith('.py'):
name = name[:-3]
__import__(name)
sys.path = opath
return sys.modules[name]
return sys.modules[modname]
# Remove python suffix
name = chop_py_suffix(os.path.basename(modname))
# Retry to import
mod = importlib.import_module(name)
# Restore sys.path
sys.path = original_path
return mod
def round_up(x, y):