SF.net SVN: matplotlib:[7039] branches/v0_98_5_maint

[<jd...@us...>]

Revision: 7039
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7039&view=rev
Author:   jdh2358
Date:     2009-04-13 02:56:11 +0000 (Mon, 13 Apr 2009)

Log Message:
-----------
fixed csv2rec bug referenced in sf bug 2745173

Modified Paths:
--------------
    branches/v0_98_5_maint/doc/matplotlibrc
    branches/v0_98_5_maint/lib/matplotlib/mlab.py

Modified: branches/v0_98_5_maint/doc/matplotlibrc
===================================================================
--- branches/v0_98_5_maint/doc/matplotlibrc	2009-04-13 02:22:30 UTC (rev 7038)
+++ branches/v0_98_5_maint/doc/matplotlibrc	2009-04-13 02:56:11 UTC (rev 7039)
@@ -27,7 +27,6 @@
 # the default backend; one of GTK GTKAgg GTKCairo FltkAgg QtAgg TkAgg
 # WX WXAgg Agg Cairo GD GDK Paint PS PDF SVG Template
 backend      : Agg
-numerix      : numpy  # numpy, Numeric or numarray
 #maskedarray : False       # True to use external maskedarray module
                            # instead of numpy.ma; this is a temporary
                            # setting for testing maskedarray.

Modified: branches/v0_98_5_maint/lib/matplotlib/mlab.py
===================================================================
--- branches/v0_98_5_maint/lib/matplotlib/mlab.py	2009-04-13 02:22:30 UTC (rev 7038)
+++ branches/v0_98_5_maint/lib/matplotlib/mlab.py	2009-04-13 02:56:11 UTC (rev 7039)
@@ -2532,8 +2532,14 @@
     fh.seek(0)
     reader = csv.reader(fh, delimiter=delimiter)
     process_skiprows(reader)
+
     if needheader:
-        skipheader = reader.next()
+        while 1:
+	    # skip past any comments and consume one line of column header
+	    row = reader.next()
+	    if len(row) and row[0].startswith(comments):
+	        continue
+	    break
 
     # iterate over the remaining rows and convert the data to date
     # objects, ints, or floats as approriate


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.