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

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

Revision: 7239
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=7239&view=rev
Author:   jdh2358
Date:     2009-06-24 21:01:53 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
some tweaks to csv2rec and rec2csv

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/doc/api/api_changes.rst
    trunk/matplotlib/doc/devel/release_guide.rst
    trunk/matplotlib/lib/matplotlib/mlab.py

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2009-06-24 18:53:48 UTC (rev 7238)
+++ trunk/matplotlib/CHANGELOG	2009-06-24 21:01:53 UTC (rev 7239)
@@ -1,3 +1,8 @@
+2009-06-24 Add withheader option to mlab.rec2csv and changed
+  use_mrecords default to False in mlab.csv2rec since this is
+  partially broken - JDH
+
+
 2009-06-24 backend_agg.draw_marker quantizes the main path (as in the
            draw_path). - JJL
 

Modified: trunk/matplotlib/doc/api/api_changes.rst
===================================================================
--- trunk/matplotlib/doc/api/api_changes.rst	2009-06-24 18:53:48 UTC (rev 7238)
+++ trunk/matplotlib/doc/api/api_changes.rst	2009-06-24 21:01:53 UTC (rev 7239)
@@ -1,3 +1,4 @@
+
 ===========
 API Changes
 ===========
@@ -20,7 +21,10 @@
 Changes beyond 0.98.x
 =====================
 
-* Axes instanaces no longer have a "frame" attribute. Instead, use the
+* changed use_mrecords default to False in mlab.csv2rec since this is
+  partially broken
+
+* Axes instances no longer have a "frame" attribute. Instead, use the
   new "spines" attribute. Spines is a dictionary where the keys are
   the names of the spines (e.g. 'left','right' and so on) and the
   values are the artists that draw the spines. For normal

Modified: trunk/matplotlib/doc/devel/release_guide.rst
===================================================================
--- trunk/matplotlib/doc/devel/release_guide.rst	2009-06-24 18:53:48 UTC (rev 7238)
+++ trunk/matplotlib/doc/devel/release_guide.rst	2009-06-24 21:01:53 UTC (rev 7239)
@@ -64,16 +64,18 @@
   or off any platform specific build options you need.  Importantly,
   you also need to make sure that you delete the :file:`build` dir
   after any changes to file:`setup.cfg` before rebuilding since cruft
-  in the :file:`build` dir can get carried along.  I will add this to
-  the devel release notes,
+  in the :file:`build` dir can get carried along.
 
 * on windows, unix2dos the rc file
 
 * We have a Makefile for the OS X builds in the mpl source dir
   :file:`release/osx`, so use this to prepare the OS X releases.
 
+* We have a Makefile for the win32 mingw builds in the mpl source dir
+  :file:`release/win32` which you can use this to prepare the windows
+  releases, but this is currently broken for python2.6 as described at
+  http://www.nabble.com/binary-installers-for-python2.6--libpng-segfault%2C-MSVCR90.DLL-and-%09mingw-td23971661.html
 
-
 .. _release-candidate-testing:
 
 Release candidate testing:

Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2009-06-24 18:53:48 UTC (rev 7238)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2009-06-24 21:01:53 UTC (rev 7239)
@@ -2052,7 +2052,7 @@
 
 def csv2rec(fname, comments='#', skiprows=0, checkrows=0, delimiter=',',
             converterd=None, names=None, missing='', missingd=None,
-            use_mrecords=True):
+            use_mrecords=False):
     """
     Load data from comma/space/tab delimited file in *fname* into a
     numpy record array and return the record array.
@@ -2560,7 +2560,7 @@
 
 
 def rec2csv(r, fname, delimiter=',', formatd=None, missing='',
-            missingd=None):
+            missingd=None, withheader=True):
     """
     Save the data from numpy recarray *r* into a
     comma-/space-/tab-delimited file.  The record array dtype names
@@ -2569,6 +2569,9 @@
     *fname*: can be a filename or a file handle.  Support for gzipped
       files is automatic, if the filename ends in '.gz'
 
+    *withheader*: if withheader is False, do not write the attribute
+      names in the first row
+
     .. seealso::
 
         :func:`csv2rec`
@@ -2595,7 +2598,8 @@
     fh, opened = cbook.to_filehandle(fname, 'w', return_opened=True)
     writer = csv.writer(fh, delimiter=delimiter)
     header = r.dtype.names
-    writer.writerow(header)
+    if withheader:
+        writer.writerow(header)
 
     # Our list of specials for missing values
     mvals = []


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