[gnue] r7435 - in trunk/gnue-common/src/datasources/drivers: adodbapi/Schema/Discovery file

[reinhard]

Author: reinhard
Date: 2005-04-20 06:47:33 -0500 (Wed, 20 Apr 2005)
New Revision: 7435

Modified:
   
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
   trunk/gnue-common/src/datasources/drivers/file/Base.py
Log:
Now I start to understand where the problems with epydoc come from...


Modified: 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
===================================================================
--- 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
        2005-04-20 11:08:40 UTC (rev 7434)
+++ 
trunk/gnue-common/src/datasources/drivers/adodbapi/Schema/Discovery/Introspection.py
        2005-04-20 11:47:33 UTC (rev 7435)
@@ -28,8 +28,6 @@
 
 __all__ = ['Introspection']
 
-import adodbapi
-
 import string
 from string import lower, join, split
 import sys
@@ -121,6 +119,10 @@
 
   # Get fields for a table
   def __getFieldSchema(self, parent):
+
+    # Do this import here so epydoc doesn't stumble if it's not installed
+    import adodbapi
+
     statement = "select * from %s where 0=1" % (parent.name)
 
     cursor = self._connection.makecursor(statement)

Modified: trunk/gnue-common/src/datasources/drivers/file/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/Base.py      2005-04-20 
11:08:40 UTC (rev 7434)
+++ trunk/gnue-common/src/datasources/drivers/file/Base.py      2005-04-20 
11:47:33 UTC (rev 7435)
@@ -38,7 +38,8 @@
 
 class Introspection (GIntrospection.Introspection):
 
-  types = [('table', _('Tables'), 1)]
+  # We must use i18n.translate instead of _ here so epydoc can parse it...
+  types = [('table', i18n.translate ('Tables'), 1)]
 
   # ---------------------------------------------------------------------------
   # Find a schema element by name and/or type