[conduit: 13/138] Fix it :D

[John Carr <johncarr src gnome org>]

commit b17f4e09f5ae9e6fed6a5dfdb1d28410d803ddd9
Author: Karen Chan <cee wing gmail com>
Date:   Mon Apr 20 06:49:01 2009 -0700

    Fix it :D
---
 test/soup/__init__.py         |    2 +-
 test/soup/modules/__init__.py |    5 ++---
 test/soup/modules/folder.py   |    4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/test/soup/__init__.py b/test/soup/__init__.py
index e5d0c30..b5a5c0f 100644
--- a/test/soup/__init__.py
+++ b/test/soup/__init__.py
@@ -61,6 +61,6 @@ class TestCase(unittest.TestCase):
         except KeyError:
             return False
 
-
 import modules
+modules.load_modules()
 print modules.get_all()
diff --git a/test/soup/modules/__init__.py b/test/soup/modules/__init__.py
index 91dfd2d..19bae15 100644
--- a/test/soup/modules/__init__.py
+++ b/test/soup/modules/__init__.py
@@ -53,9 +53,8 @@ def load_module(module):
     if sys.modules.has_key(module):
         reload(sys.modules[module])
     else:
-        __import__("modules", {}, {}, [module])
-
-load_modules()
+        __import__("soup.modules", {}, {}, [module])
 
 def get_all():
     return ModuleWrapper.__subclasses__()
+
diff --git a/test/soup/modules/folder.py b/test/soup/modules/folder.py
index 3eb89d3..d53b844 100644
--- a/test/soup/modules/folder.py
+++ b/test/soup/modules/folder.py
@@ -1,8 +1,8 @@
-import modules
+import soup.modules
 
 import conduit.utils as Utils
 
-class FolderWrapper(modules.ModuleWrapper):
+class FolderWrapper(soup.modules.ModuleWrapper):
 
     def create_dataprovider(self):
         dp = self.conduit.get_dataprovider("FolderTwoWay")