From b3f48f70647ebebe227dc03b1e0ae119010599d9 Mon Sep 17 00:00:00 2001 From: Rick Harris Date: Thu, 15 Dec 2011 22:38:05 +0000 Subject: [PATCH] Making contrib a Python package Change-Id: Ibfde2e5cbececeec0b6a17f7d71da207f582a5c7 --- novaclient/shell.py | 4 ++++ novaclient/v1_1/contrib/__init__.py | 0 setup.py | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 novaclient/v1_1/contrib/__init__.py diff --git a/novaclient/shell.py b/novaclient/shell.py index 5c91b890b..d573ae87a 100644 --- a/novaclient/shell.py +++ b/novaclient/shell.py @@ -134,6 +134,10 @@ class OpenStackComputeShell(object): extensions = [] for ext_path in glob.iglob(ext_glob): name = os.path.basename(ext_path)[:-3] + + if name == "__init__": + continue + ext_module = imp.load_source(name, ext_path) # Extract Manager class diff --git a/novaclient/v1_1/contrib/__init__.py b/novaclient/v1_1/contrib/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/setup.py b/setup.py index a272211fa..c04d7b9f6 100644 --- a/setup.py +++ b/setup.py @@ -35,7 +35,7 @@ setuptools.setup( long_description=read_file("README.rst"), license="Apache License, Version 2.0", url="https://github.com/openstack/python-novaclient", - packages=["novaclient", "novaclient.v1_0", "novaclient.v1_1"], + packages=["novaclient", "novaclient.v1_1", "novaclient.v1_1.contrib"], install_requires=requirements, tests_require=["nose", "mock"], test_suite="nose.collector",