[conduit: 108/138] Bit cleaner like this

[John Carr <johncarr src gnome org>]

commit d8bfd0c76fc12fa6d286b6a80801e3dc0d9bba3a
Author: John Carr <john carr unrouted co uk>
Date:   Wed May 6 02:45:09 2009 -0700

    Bit cleaner like this
---
 test/soup/test_dataprovider.py    |    3 ++-
 test/soup/test_datatypes.py       |    3 ++-
 test/soup/test_synchronization.py |    4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/soup/test_dataprovider.py b/test/soup/test_dataprovider.py
index f1f6f4e..f5291d5 100644
--- a/test/soup/test_dataprovider.py
+++ b/test/soup/test_dataprovider.py
@@ -1,4 +1,5 @@
 import soup
+from soup.modules import ModuleLoader
 
 def make_testcase(wrp):
     class TestDataprovider(soup.TestCase):
@@ -71,7 +72,7 @@ def make_testcase(wrp):
 
 # Generate TestCase objects for each dataprovider wrapper
 self = soup.get_module(__name__)
-for wrapper in soup.modules.ModuleLoader.get_all():
+for wrapper in ModuleLoader.get_all():
     testklass = make_testcase(wrapper)
     setattr(self, testklass.name(), testklass)
 
diff --git a/test/soup/test_datatypes.py b/test/soup/test_datatypes.py
index c686b52..b93360a 100644
--- a/test/soup/test_datatypes.py
+++ b/test/soup/test_datatypes.py
@@ -1,4 +1,5 @@
 import soup
+from soup.data import DataLoader
 
 import pickle
 
@@ -50,7 +51,7 @@ def make_testcase(wrp):
 
 # Generate TestCase objects for each datatype wrapper
 self = soup.get_module(__name__)
-for wrapper in soup.data.DataLoader.get_all():
+for wrapper in DataLoader.get_all():
     testklass = make_testcase(wrapper)
     setattr(self, testklass.name(), testklass)
 
diff --git a/test/soup/test_synchronization.py b/test/soup/test_synchronization.py
index 1bff6a7..3c2849a 100644
--- a/test/soup/test_synchronization.py
+++ b/test/soup/test_synchronization.py
@@ -1,4 +1,6 @@
+
 import soup
+from soup.modules import ModuleLoader
 
 import conduit
 
@@ -132,7 +134,7 @@ def make_testcase(src, src_data, snk, snk_data):
 
 # Generate all the variations of TestSynchronization
 self = soup.get_module(__name__)
-mods = soup.modules.ModuleLoader.get_all()
+mods = ModuleLoader.get_all()
 for i in range(len(mods)):
     for j in range(len(mods)):
         source = mods[i]