[gnue] r7642 - in trunk/gnue-common: . src/apps

[johannes]

Author: johannes
Date: 2005-06-22 10:10:00 -0500 (Wed, 22 Jun 2005)
New Revision: 7642

Modified:
   trunk/gnue-common/BUGS
   trunk/gnue-common/src/apps/GImportLogger.py
   trunk/gnue-common/src/apps/plugin.py
Log:
Fixed plugin.find () if used with --debug-imports


Modified: trunk/gnue-common/BUGS
===================================================================
--- trunk/gnue-common/BUGS      2005-06-22 13:58:32 UTC (rev 7641)
+++ trunk/gnue-common/BUGS      2005-06-22 15:10:00 UTC (rev 7642)
@@ -1,10 +1,6 @@
 datasources
 -----------
 
-* Using --debug-imports breaks the loading of datasource drivers.
-  This matches the behaviour of the code when it was in designer only
-  Need to find out if this was a known issue and if so then if any
-  work was done to rectify it
 * Some drivers are broken for time fields (time without date) (due to bugs in
   the DBSIG2 module)
 * Different drivers return different Python datatypes for the same type of row

Modified: trunk/gnue-common/src/apps/GImportLogger.py
===================================================================
--- trunk/gnue-common/src/apps/GImportLogger.py 2005-06-22 13:58:32 UTC (rev 
7641)
+++ trunk/gnue-common/src/apps/GImportLogger.py 2005-06-22 15:10:00 UTC (rev 
7642)
@@ -19,7 +19,7 @@
 # write to the Free Software Foundation, Inc., 59 Temple Place
 # - Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: GDebug.py 7224 2005-03-18 17:13:13Z jcater $
+# $Id$
 #
 """
 Importing this module causes all modules imported after this
@@ -33,9 +33,8 @@
 
 class GImportLogger(ihooks.ModuleLoader):
 
-  def load_module(self, name, stuff):  
-    global _import_indent 
-    print "." * _import_indent + "Importing %s..." % name
+  def load_module(self, name, stuff):
+    global _import_indent
     _import_indent += 1
 
     module = ihooks.ModuleLoader.load_module(self, name, stuff)


Property changes on: trunk/gnue-common/src/apps/GImportLogger.py
___________________________________________________________________
Name: svn:keywords
   + Id

Modified: trunk/gnue-common/src/apps/plugin.py
===================================================================
--- trunk/gnue-common/src/apps/plugin.py        2005-06-22 13:58:32 UTC (rev 
7641)
+++ trunk/gnue-common/src/apps/plugin.py        2005-06-22 15:10:00 UTC (rev 
7642)
@@ -194,7 +194,14 @@
 
 def __modules (package, want_packages):
 
-  (basedir, basefile) = os.path.split (package.__file__)
+  # package.__file__ is a directory if GImportLogger is in use. This makes it
+  # necessary to 'simulate' a package, otherwise stepping down subpackages
+  # won't work.
+  if os.path.isdir (package.__file__):
+    (basedir, basefile) = (package.__file__, '__init__.py')
+  else:
+    (basedir, basefile) = os.path.split (package.__file__)
+
   (basename, baseext) = os.path.splitext (basefile)
 
   if basename != '__init__':
@@ -211,6 +218,7 @@
        (os.path.isdir (subpath) and \
         os.path.isfile (os.path.join (subpath, '__init__.py'))):
       result = result + [subname]
+
   return result
 
 
@@ -344,6 +352,7 @@
     if isinstance (result, ModuleType):
       return result
     exceptions.update (result)
+
   return exceptions