SF.net SVN: matplotlib:[7040] trunk/matplotlib

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

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

Log Message:
-----------
Merged revisions 7037-7039 via svnmerge from 
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
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/doc/matplotlibrc
    trunk/matplotlib/lib/matplotlib/mlab.py
    trunk/matplotlib/setupext.py

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7035
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7039

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-04-13 02:56:11 UTC (rev 7039)
+++ trunk/matplotlib/CHANGELOG	2009-04-13 03:02:41 UTC (rev 7040)
@@ -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.
 

Modified: trunk/matplotlib/doc/matplotlibrc
===================================================================
--- trunk/matplotlib/doc/matplotlibrc	2009-04-13 02:56:11 UTC (rev 7039)
+++ trunk/matplotlib/doc/matplotlibrc	2009-04-13 03:02:41 UTC (rev 7040)
@@ -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: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2009-04-13 02:56:11 UTC (rev 7039)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2009-04-13 03:02:41 UTC (rev 7040)
@@ -2552,8 +2552,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

Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2009-04-13 02:56:11 UTC (rev 7039)
+++ trunk/matplotlib/setupext.py	2009-04-13 03:02:41 UTC (rev 7040)
@@ -952,11 +952,14 @@
     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')


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