Merged revisions 7037-7039 via svnmerge from

jdh2358 · jdh2358 · commit 5b09a7a6436d · 2009-04-13T03:02:41.000Z
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r7037 | cmoad | 2009-04-10 21:24:37 -0500 (Fri, 10 Apr 2009) | 1 line added python 2.6 / tcltk 8.5 check ........ r7038 | cmoad | 2009-04-12 21:22:30 -0500 (Sun, 12 Apr 2009) | 1 line minor rev bump ........ r7039 | jdh2358 | 2009-04-12 21:56:11 -0500 (Sun, 12 Apr 2009) | 1 line fixed csv2rec bug referenced in sf bug 2745173 ........ svn path=/trunk/matplotlib/; revision=7040
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+======================================================================
+2008-04-12 Release 0.98.5.3 at r7038
+
 2009-04-06 The pdf backend now escapes newlines and linefeeds in strings.
            Fixes sf bug #2708559; thanks to Tiago Pereira for the report.
 
diff --git a/doc/matplotlibrc b/doc/matplotlibrc
@@ -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.
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2552,8 +2552,14 @@ def get_converters(reader):
     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
diff --git a/setupext.py b/setupext.py
@@ -952,11 +952,14 @@ def add_tk_flags(module):
     message = None
     if sys.platform == 'win32':
         major, minor1, minor2, s, tmp = sys.version_info
-        if major == 2 and minor1 in [3, 4, 5]:
-            module.include_dirs.extend(['win32_static/include/tcl8.4'])
+        if major == 2 and minor1 == 6:
+            module.include_dirs.extend(['win32_static/include/tcl85'])
+            module.libraries.extend(['tk85', 'tcl85'])
+        elif major == 2 and minor1 in [3, 4, 5]:
+            module.include_dirs.extend(['win32_static/include/tcl84'])
             module.libraries.extend(['tk84', 'tcl84'])
         elif major == 2 and minor1 == 2:
-            module.include_dirs.extend(['win32_static/include/tcl8.3'])
+            module.include_dirs.extend(['win32_static/include/tcl83'])
             module.libraries.extend(['tk83', 'tcl83'])
         else:
             raise RuntimeError('No tk/win32 support for this python version yet')
