add try / except to address issue #10154 to_datetime, Inconsistent be…

pandas/tests/test_tseries.py

@@ -2,7 +2,7 @@
 import nose
 from numpy import nan
 import numpy as np
-from pandas import Index, isnull, Timestamp
+from pandas import Index, isnull, Timestamp, to_datetime, NaT
 from pandas.util.testing import assert_almost_equal
 import pandas.util.testing as tm
 from pandas.compat import range, lrange, zip
@@ -737,6 +737,17 @@ def test_get_period_field_raises_on_out_of_range(self):
     def test_get_period_field_array_raises_on_out_of_range(self):
         self.assertRaises(ValueError, period.get_period_field_arr, -1, np.empty(1), 0)
 
+class TestDaysInMonth(tm.TestCase):
+    def test_day_not_in_month_coerce_true(self):
+        self.assertTrue(isnull(to_datetime('2015-02-29', coerce=True)))
+        self.assertTrue(isnull(to_datetime('2015-02-29', format="%Y-%m-%d", coerce=True)))
+        self.assertTrue(isnull(to_datetime('2015-02-32', format="%Y-%m-%d", coerce=True)))
+        self.assertTrue(isnull(to_datetime('2015-04-31', format="%Y-%m-%d", coerce=True)))
+    def test_day_not_in_month_coerce_false(self):
+        self.assertRaises(ValueError, to_datetime, '2015-02-29', format="%Y-%m-%d", coerce=False)
+        self.assertRaises(ValueError, to_datetime, '2015-02-32', format="%Y-%m-%d", coerce=False)
+        self.assertRaises(ValueError, to_datetime, '2015-04-31', format="%Y-%m-%d", coerce=False)
+
 if __name__ == '__main__':
     import nose
     nose.runmodule(argv=[__file__, '-vvs', '-x', '--pdb', '--pdb-failure'],

pandas/tslib.pyx

@@ -2483,17 +2483,24 @@ def array_strptime(ndarray[object] values, object fmt, bint exact=True, bint coe
         # Cannot pre-calculate datetime_date() since can change in Julian
         # calculation and thus could have different value for the day of the wk
         # calculation.
-        if julian == -1:
-            # Need to add 1 to result since first day of the year is 1, not 0.
-            julian = datetime_date(year, month, day).toordinal() - \
-                      datetime_date(year, 1, 1).toordinal() + 1
-        else: # Assume that if they bothered to include Julian day it will
-            # be accurate.
-            datetime_result = datetime_date.fromordinal(
-                (julian - 1) + datetime_date(year, 1, 1).toordinal())
-            year = datetime_result.year
-            month = datetime_result.month
-            day = datetime_result.day
+        try:
+            if julian == -1:
+                # Need to add 1 to result since first day of the year is 1, not 0.
+                julian = datetime_date(year, month, day).toordinal() - \
+                         datetime_date(year, 1, 1).toordinal() + 1
+
+            else: # Assume that if they bothered to include Julian day it will
+                # be accurate.
+                datetime_result = datetime_date.fromordinal(
+                    (julian - 1) + datetime_date(year, 1, 1).toordinal())
+                year = datetime_result.year
+                month = datetime_result.month
+                day = datetime_result.day
+        except ValueError:
+                if coerce:
+                    iresult[i] = iNaT
+                    continue
+                raise
         if weekday == -1:
             weekday = datetime_date(year, month, day).weekday()