Merge branch 'release/1.1.1'

ZenPacks/zenoss/CloudStack/locallibs.py

@@ -0,0 +1,21 @@
+##############################################################################
+#
+# Copyright (C) Zenoss, Inc. 2013, all rights reserved.
+#
+# This content is made available according to terms specified in
+# License.zenoss under the directory where your Zenoss product is installed.
+#
+##############################################################################
+
+
+def add_local_lib_path():
+ '''
+ Helper to add the ZenPack's lib directory to sys.path.
+ '''
+ import os
+ import site
+
+ site.addsitedir(os.path.join(os.path.dirname(__file__), 'lib'))
+
+
+add_local_lib_path()

ZenPacks/zenoss/CloudStack/modeler/plugins/zenoss/CloudStack.py

@@ -19,9 +19,10 @@
 from Products.DataCollector.plugins.CollectorPlugin import PythonPlugin
 from Products.DataCollector.plugins.DataMaps import ObjectMap, RelationshipMap
 
-from ZenPacks.zenoss.CloudStack.utils import add_local_lib_path
-add_local_lib_path()
+# Imported or side effect of adding ZenPack's lib directory to sys.path.
+import ZenPacks.zenoss.CloudStack.locallibs
 
+# Requires that locallibs first be imported.
 import txcloudstack
 
 

ZenPacks/zenoss/CloudStack/poll_cloudstack.py

@@ -26,9 +26,10 @@
 from twisted.internet import reactor
 from twisted.internet.defer import DeferredList
 
-from utils import add_local_lib_path
-add_local_lib_path()
+# Imported or side effect of adding ZenPack's lib directory to sys.path.
+import locallibs
 
+# Requires that locallibs first be imported.
 import txcloudstack
 
 # Map of listEvents level response parameter to Zenoss severity.

ZenPacks/zenoss/CloudStack/tests/testTXCloudStack.py

@@ -19,10 +19,12 @@
 
 from Products.ZenTestCase.BaseTestCase import BaseTestCase
 
-from ZenPacks.zenoss.CloudStack.utils import add_local_lib_path
 from ZenPacks.zenoss.CloudStack.tests.utils import mockGetPage
 
-add_local_lib_path()
+# Imported or side effect of adding ZenPack's lib directory to sys.path.
+import ZenPacks.zenoss.CloudStack.locallibs
+
+# Requires that locallibs first be imported.
 import txcloudstack
 
 

ZenPacks/zenoss/CloudStack/utils.py

@@ -17,14 +17,6 @@
 from Products.ZenUtils.guid.interfaces import IGlobalIdentifier
 
 
-def add_local_lib_path():
- """Helper to add the ZenPack's lib directory to PYTHONPATH."""
- import os
- import site
-
- site.addsitedir(os.path.join(os.path.dirname(__file__), 'lib'))
-
-
 def guid(obj):
  '''
  Return GUID for obj.

setup.py

@@ -3,7 +3,7 @@
 # or saved. Do not modify them directly here.
 # NB: PACKAGES is deprecated
 NAME = "ZenPacks.zenoss.CloudStack"
-VERSION = "1.1.0"
+VERSION = "1.1.1"
 AUTHOR = "Zenoss Labs <labs@zenoss.com>"
 LICENSE = "GPLv2"
 NAMESPACE_PACKAGES = ['ZenPacks', 'ZenPacks.zenoss']