openstack/python-novaclient
Code Issues Proposed changes

Merge "Prepare to move extension into core plugin"

Browse Source
This commit is contained in:
Jenkins 2016-03-10 13:54:55 +00:00 committed by Gerrit Code Review
commit b921cb14e4
1 changed files with 7 additions and 1 deletions

8
novaclient/client.py

@ -54,6 +54,12 @@ from novaclient import service_catalog
from novaclient import utils from novaclient import utils
# TODO(jichenjc): when an extension in contrib is moved to core extension,
# Add the name into the following list, then after last patch merged,
# remove the whole function
extensions_ignored_name = ["__init__"]
class _ClientConnectionPool(object): class _ClientConnectionPool(object):
def __init__(self): def __init__(self):
@ -768,7 +774,7 @@ def _discover_via_contrib_path(version):
for ext_path in glob.iglob(ext_glob): for ext_path in glob.iglob(ext_glob):
name = os.path.basename(ext_path)[:-3] name = os.path.basename(ext_path)[:-3]
if name == "__init__": if name in extensions_ignored_name:
continue continue
module = imp.load_source(name, ext_path) module = imp.load_source(name, ext_path)