[conduit: 14/138] Don't expose module loading publically

[John Carr <johncarr src gnome org>]

commit 99731751dc4677942971a7bc6023101073b9c2db
Author: John Carr <john carr unrouted co uk>
Date:   Mon Apr 20 06:57:41 2009 -0700

    Don't expose module loading publically
---
 test/soup/__init__.py         |    5 ++---
 test/soup/modules/__init__.py |    2 ++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/soup/__init__.py b/test/soup/__init__.py
index b5a5c0f..557b471 100644
--- a/test/soup/__init__.py
+++ b/test/soup/__init__.py
@@ -5,6 +5,8 @@ sys.path.insert(0, os.path.abspath(os.path.join(cwd, '..', '..')))
 
 import unittest
 
+import modules
+
 CHANGE_ADD = 1
 CHANGE_REPLACE = 2
 CHANGE_DELETE = 3
@@ -61,6 +63,3 @@ 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 19bae15..0b35930 100644
--- a/test/soup/modules/__init__.py
+++ b/test/soup/modules/__init__.py
@@ -56,5 +56,7 @@ def load_module(module):
         __import__("soup.modules", {}, {}, [module])
 
 def get_all():
+    if len(ModuleWrapper.__subclasses__()) == 0:
+        load_modules()
     return ModuleWrapper.__subclasses__()