Creation of fix to #6184 - csv2rec bug

ultra-andy · ultra-andy · commit bc3828865121 · 2016-03-21T03:40:47.000+11:00
yearfirst &amp; dayfirst date interpretation bug for datetime strings -
csv2rec does not take yearfirst or dayfirst into account when
interpreting datetime strings with a time component, so for ambiguous
cases, the month and day get transposed. Test added also.
diff --git a/lib/matplotlib/mlab.py b/lib/matplotlib/mlab.py
@@ -2838,7 +2838,8 @@ def mydateparser(x):
         # try and return a datetime object
         d = dateparser(x, dayfirst=dayfirst, yearfirst=yearfirst)
         return d
-    mydateparser = with_default_value(mydateparser, datetime.datetime(1,1,1,0,0,0))
+
+    mydateparser = with_default_value(mydateparser, datetime.datetime(1, 1, 1))
 
     myfloat = with_default_value(float, np.nan)
     myint = with_default_value(int, -1)
diff --git a/lib/matplotlib/tests/test_mlab.py b/lib/matplotlib/tests/test_mlab.py
@@ -346,6 +346,50 @@ def test_csv2rec_names_with_comments(self):
         assert len(array) == 2
         assert len(array.dtype) == 3
 
+    def test_csv2rec_usdate(self):
+        self.fd.write('01/11/14\n' +
+                '03/05/76 12:00:01 AM\n' +
+                '07/09/83 5:17:34 PM\n' +
+                '06/20/2054 2:31:45 PM\n' +
+                '10/31/00 11:50:23 AM\n')
+        expected = [datetime.datetime(2014, 1, 11, 0, 0),
+                datetime.datetime(1976, 3, 5, 0, 0, 1),
+                datetime.datetime(1983, 7, 9, 17, 17, 34),
+                datetime.datetime(2054, 6, 20, 14, 31, 45),
+                datetime.datetime(2000, 10, 31, 11, 50, 23)]
+        self.fd.seek(0)
+        array = mlab.csv2rec(self.fd, names='a')
+        assert_array_equal(array['a'].tolist(), expected)
+
+    def test_csv2rec_dayfirst(self):
+        self.fd.write('11/01/14\n' +
+                '05/03/76 12:00:01 AM\n' +
+                '09/07/83 5:17:34 PM\n' +
+                '20/06/2054 2:31:45 PM\n' +
+                '31/10/00 11:50:23 AM\n')
+        expected = [datetime.datetime(2014, 1, 11, 0, 0),
+                datetime.datetime(1976, 3, 5, 0, 0, 1),
+                datetime.datetime(1983, 7, 9, 17, 17, 34),
+                datetime.datetime(2054, 6, 20, 14, 31, 45),
+                datetime.datetime(2000, 10, 31, 11, 50, 23)]
+        self.fd.seek(0)
+        array = mlab.csv2rec(self.fd, names='a', dayfirst = True)
+        assert_array_equal(array['a'].tolist(), expected)
+
+    def test_csv2rec_yearfirst(self):
+        self.fd.write('14/01/11\n' +
+                '76/03/05 12:00:01 AM\n' +
+                '83/07/09 5:17:34 PM\n' +
+                '2054/06/20 2:31:45 PM\n' +
+                '00/10/31 11:50:23 AM\n')
+        expected = [datetime.datetime(2014, 1, 11, 0, 0),
+                datetime.datetime(1976, 3, 5, 0, 0, 1),
+                datetime.datetime(1983, 7, 9, 17, 17, 34),
+                datetime.datetime(2054, 6, 20, 14, 31, 45),
+                datetime.datetime(2000, 10, 31, 11, 50, 23)]
+        self.fd.seek(0)
+        array = mlab.csv2rec(self.fd, names='a', yearfirst = True)
+        assert_array_equal(array['a'].tolist(), expected)
 
 class window_testcase(CleanupTestCase):
     def setUp(self):
