Merge pull request #300 from alde/explicitly-import-collectors

Use the imp library to import collectors

Author: josegonzalez

src/diamond/utils/classes.py

@@ -7,6 +7,7 @@
 import inspect
 import traceback
 import pkg_resources
+import imp
 
 from diamond.util import load_class_from_name
 from diamond.collector import Collector
@@ -151,9 +152,11 @@ def load_collectors_from_paths(paths):
 
                 modname = f[:-3]
 
+                fp, pathname, description = imp.find_module(modname, [path])
+
                 try:
                     # Import the module
-                    mod = __import__(modname, globals(), locals(), ['*'])
+                    mod = imp.load_module(modname, fp, pathname, description)
                 except (KeyboardInterrupt, SystemExit), err:
                     logger.error(
                         "System or keyboard interrupt "
@@ -170,6 +173,9 @@ def load_collectors_from_paths(paths):
                 else:
                     for name, cls in get_collectors_from_module(mod):
                         collectors[name] = cls
+                finally:
+                    if fp:
+                        fp.close()
 
     # Return Collector classes
     return collectors