[gnue] r7510 - trunk/gnue-common/src/datasources/drivers/file

[johannes]

Author: johannes
Date: 2005-05-02 07:31:08 -0500 (Mon, 02 May 2005)
New Revision: 7510

Modified:
   trunk/gnue-common/src/datasources/drivers/file/dbffile.py
Log:
Use our own dbf module


Modified: trunk/gnue-common/src/datasources/drivers/file/dbffile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/dbffile.py   2005-05-02 
12:24:38 UTC (rev 7509)
+++ trunk/gnue-common/src/datasources/drivers/file/dbffile.py   2005-05-02 
12:31:08 UTC (rev 7510)
@@ -21,10 +21,8 @@
 #
 # $Id$
 
-def __initplugin__ ():
-  import dbf
-
 from gnue.common.datasources.drivers.file import Base
+from gnue.common.utils import dbf
 
 
 # =============================================================================
@@ -48,8 +46,6 @@
 
   def _listFields (self, filename, table):
 
-    import dbf
-
     f = dbf.dbf (filename)
 
     for field in f.fields:
@@ -68,20 +64,4 @@
 
   def _loadFile (self, filename, table):
 
-    import dbf
-
-    f = dbf.dbf (filename)
-
-    fieldnames = [field [0] for field in f.fields]
-
-    # Make a real list of dictionaries
-    # return [dict (zip (fieldnames, record)) for record in f]
-    # We need to go through fields manually as the record doesn't support an
-    # iterator.
-    result = []
-    for record in f:
-      row = {}
-      for (i, fieldname) in enumerate (fieldnames):
-        row [fieldname] = record [i]
-      result.append (row)
-    return result
+    return [rec for rec in dbf.dbf (filename)]