Split out PyGObject from PyGTK.

1 files changed, 5 insertions, 15 deletions

diff --git a/tests/common.py b/tests/common.py
index e970461..627e281 100644
--- a/tests/common.py
+++ b/tests/common.py
@@ -7,27 +7,16 @@ def importModules(buildDir, srcDir):
     
     # ltihooks
     sys.path.insert(0, srcDir)
-    # atk, pango
-    sys.path.insert(0, buildDir)
+    import ltihooks
+    sys.path.remove(srcDir)
+
     # gobject
     sys.path.insert(0, os.path.join(buildDir, 'gobject'))
-    # _gtk, keysyms, glade
-    sys.path.insert(0, os.path.join(buildDir, 'gtk'))
     # testhelper
     sys.path.insert(0, os.path.join(buildDir, 'tests'))
     sys.argv.append('--g-fatal-warnings')
-    import ltihooks
     
     gobject = importModule('gobject', buildDir, 'gobject/gobject.la')
-    atk = importModule('atk', buildDir)
-    pango = importModule('pango', buildDir)
-    gtk = importModule('gtk', buildDir, 'gtk')
-    gdk = importModule('gtk.gdk', buildDir, '_gdk.la')
-    try:
-        glade = importModule('gtk.glade', buildDir, 'glade.la')
-    except ImportError:
-        glade = None
-        
     testhelper = importModule('testhelper', '.')
         
     ltihooks.uninstall()
@@ -52,8 +41,9 @@ def importModule(module, directory, name=None):
 
     try:
         obj = __import__(module, {}, {}, fromlist)
-    except ImportError:
+    except ImportError, e:
         print 'WARNING: %s could not be imported' % origName
+        print e
         return 
     
     if hasattr(obj, '__file__'):