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

Author: reinhard
Date: 2010-01-04 11:36:53 -0600 (Mon, 04 Jan 2010)
New Revision: 10146

Modified:
   trunk/gnue-common/src/datasources/drivers/file/csvfile.py
Log:
Safeguard CSV reader against lines with too many fields.


Modified: trunk/gnue-common/src/datasources/drivers/file/csvfile.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/csvfile.py	2009-12-26 21:17:43 UTC (rev 10145)
+++ trunk/gnue-common/src/datasources/drivers/file/csvfile.py	2010-01-04 17:36:53 UTC (rev 10146)
@@ -128,8 +128,9 @@
     reader = csv.DictReader (f, fieldnames, dialect = dialect)
 
     # Make a real list of dictionaries and convert to unicode.
-    return [dict( [(k, unicode(v, self.__encoding, errors='replace')) \
-                for (k, v) in row.iteritems()]) for row in reader]
+    return [dict([(k, unicode(v, self.__encoding, errors='replace')) \
+                for (k, v) in row.iteritems() if k is not None]) \
+                for row in reader]
 
 
   # ---------------------------------------------------------------------------