Merge pull request #1210 from dmcdougall/csv2rec_date

pelson · pelson · commit ff6d7eb09d8f · 2013-04-02T03:52:30.000-07:00
Add dateutil kwargs to csv2rec
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2092,7 +2092,7 @@ def extract(r):
 
 def csv2rec(fname, comments='#', skiprows=0, checkrows=0, delimiter=',',
             converterd=None, names=None, missing='', missingd=None,
-            use_mrecords=False):
+            use_mrecords=False, dayfirst=False, yearfirst=False):
     """
     Load data from comma/space/tab delimited file in *fname* into a
     numpy record array and return the record array.
@@ -2131,6 +2131,14 @@ def csv2rec(fname, comments='#', skiprows=0, checkrows=0, delimiter=',',
 
     - *use_mrecords*: if True, return an mrecords.fromrecords record array if any of the data are missing
 
+    - *dayfirst*: default is False so that MM-DD-YY has precedence over
+      DD-MM-YY.  See http://labix.org/python-dateutil#head-b95ce2094d189a89f80f5ae52a05b4ab7b41af47
+      for further information.
+
+    - *yearfirst*: default is False so that MM-DD-YY has precedence over
+      YY-MM-DD.  See http://labix.org/python-dateutil#head-b95ce2094d189a89f80f5ae52a05b4ab7b41af47
+      for further information.
+
       If no rows are found, *None* is returned -- see :file:`examples/loadrec.py`
     """
 
@@ -2218,7 +2226,7 @@ def mybool(x):
 
     def mydate(x):
         # try and return a date object
-        d = dateparser(x)
+        d = dateparser(x, dayfirst=dayfirst, yearfirst=yearfirst)
 
         if d.hour>0 or d.minute>0 or d.second>0:
             raise ValueError('not a date')
