diff options
| author | Jim Rollenhagen <jim@jimrollenhagen.com> | 2015-12-30 23:58:20 +0000 |
|---|---|---|
| committer | Jim Rollenhagen <jim@jimrollenhagen.com> | 2015-12-31 00:04:33 +0000 |
| commit | 48c9a91de6951fd428eb866fe9356c5ebf9601a1 (patch) | |
| tree | 1ac02ca677e8b64eed752aeb144c41960beee42d /novaclient/client.py | |
| parent | fecf833ba5d150756f31ab5ae03d69f630d7f955 (diff) | |
| download | python-novaclient-48c9a91de6951fd428eb866fe9356c5ebf9601a1.tar.gz | |
Fix extension loading from python path on Python 2.7
Commit 81f8fa655ccecd409fe6dcda0d3763592c053e57 broke extension loading
from pythonpath on python 2.7 due to the removal of code that was
erroneously marked for 2.6 compatibility. Put it back.
Change-Id: Ic04f4d57953967fde9817ff5119ce0182453a86d
Closes-Bug: #1530230
Diffstat (limited to 'novaclient/client.py')
| -rw-r--r-- | novaclient/client.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/novaclient/client.py b/novaclient/client.py index 11190687..b2c00379 100644 --- a/novaclient/client.py +++ b/novaclient/client.py @@ -741,6 +741,8 @@ def discover_extensions(version): def _discover_via_python_path(): for (module_loader, name, _ispkg) in pkgutil.iter_modules(): if name.endswith('_python_novaclient_ext'): + if not hasattr(module_loader, 'load_module'): + module_loader = module_loader.find_module(name) module = module_loader.load_module(name) if hasattr(module, 'extension_name'): name = module.extension_name |