openstack/python-novaclient
Code Issues Proposed changes

Fix extension loading from python path on Python 2.7

Browse Source 
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
This commit is contained in:
Jim Rollenhagen 2015-12-30 23:58:20 +00:00
parent fecf833ba5
commit 48c9a91de6
1 changed files with 2 additions and 0 deletions

2
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