Better use of __import__

neo/debug.py

@@ -101,7 +101,7 @@ if IF == 'pdb':
         def __init__(self, bp_list):
             self._lock = threading.Lock()
             for o, name in bp_list:
-                o = __import__(o, fromlist=1)
+                o = __import__(o, fromlist=('*',), level=0)
                 x = name.split('.')
                 name = x.pop()
                 for x in x:

neo/scripts/runner.py

@@ -173,7 +173,7 @@ class NeoTestRunner(unittest.TextTestResult):
                              exclude != fnmatchcase(test_module, only)):
                 continue
             try:
-                test_module = __import__(test_module, globals(), locals(), ['*'])
+                test_module = __import__(test_module, fromlist=('*',), level=0)
             except ImportError, err:
                 self.failedImports[test_module] = err
                 print "Import of %s failed : %s" % (test_module, err)

neo/storage/database/__init__.py

@@ -29,8 +29,7 @@ def getAdapterKlass(name):
         module, name = DATABASE_MANAGER_DICT[name or 'MySQL'].split('.')
     except KeyError:
         raise DatabaseFailure('Cannot find a database adapter <%s>' % name)
-    module = getattr(__import__(__name__, fromlist=[module], level=1), module)
-    return getattr(module, name)
+    return getattr(__import__(module, globals(), level=1), name)
 
 def buildDatabaseManager(name, args=(), kw={}):
     return getAdapterKlass(name)(*args, **kw)

neo/tests/functional/__init__.py

@@ -125,7 +125,7 @@ class NEOProcess(object):
 
     def __init__(self, command, uuid, arg_dict):
         try:
-            __import__('neo.scripts.' + command)
+            __import__('neo.scripts.' + command, level=0)
         except ImportError:
             raise NotFound, '%s not found' % (command)
         self.command = command