removed string-to-dts-noexc and parse_iso_8601_datetime_noexc

Author: anmyachev

pandas/_libs/tslib.pyx

@@ -20,7 +20,7 @@ from pandas._libs.util cimport (
 from pandas._libs.tslibs.c_timestamp cimport _Timestamp
 
 from pandas._libs.tslibs.np_datetime cimport (
-    _string_to_dts_noexc, check_dts_bounds, npy_datetimestruct, _string_to_dts,
+    check_dts_bounds, npy_datetimestruct, _string_to_dts,
     dt64_to_dtstruct, dtstruct_to_dt64, pydatetime_to_dt64, pydate_to_dt64,
     get_datetime64_value)
 from pandas._libs.tslibs.np_datetime import OutOfBoundsDatetime
@@ -205,7 +205,8 @@ def _test_parse_iso8601(object ts):
     elif ts == 'today':
         return Timestamp.now().normalize()
 
-    _string_to_dts(ts, &obj.dts, &out_local, &out_tzoffset)
+    if _string_to_dts(ts, &obj.dts, &out_local, &out_tzoffset) == -1:
+        raise ValueError
     obj.value = dtstruct_to_dt64(&obj.dts)
     check_dts_bounds(&obj.dts)
     if out_local == 1:
@@ -580,7 +581,7 @@ cpdef array_to_datetime(ndarray[object] values, str errors='raise',
                         iresult[i] = NPY_NAT
                         continue
 
-                    string_to_dts_failed = _string_to_dts_noexc(
+                    string_to_dts_failed = _string_to_dts(
                         val, &dts, &out_local,
                         &out_tzoffset
                     )

pandas/_libs/tslibs/conversion.pyx

@@ -443,47 +443,57 @@ cdef _TSObject convert_str_to_tsobject(object ts, object tz, object unit,
         ts = datetime.now(tz)
         # equiv: datetime.today().replace(tzinfo=tz)
     else:
-        try:
-            _string_to_dts(ts, &obj.dts, &out_local, &out_tzoffset)
-            obj.value = dtstruct_to_dt64(&obj.dts)
-            check_dts_bounds(&obj.dts)
-            if out_local == 1:
-                obj.tzinfo = pytz.FixedOffset(out_tzoffset)
-                obj.value = tz_convert_single(obj.value, obj.tzinfo, UTC)
-                if tz is None:
-                    check_dts_bounds(&obj.dts)
-                    check_overflows(obj)
-                    return obj
-                else:
-                    # Keep the converter same as PyDateTime's
-                    obj = convert_to_tsobject(obj.value, obj.tzinfo,
-                                              None, 0, 0)
-                    dt = datetime(obj.dts.year, obj.dts.month, obj.dts.day,
-                                  obj.dts.hour, obj.dts.min, obj.dts.sec,
-                                  obj.dts.us, obj.tzinfo)
-                    obj = convert_datetime_to_tsobject(
-                        dt, tz, nanos=obj.dts.ps // 1000)
-                    return obj
-
-            else:
-                ts = obj.value
-                if tz is not None:
-                    # shift for localize_tso
-                    ts = tz_localize_to_utc(np.array([ts], dtype='i8'), tz,
-                                            ambiguous='raise')[0]
-
-        except OutOfBoundsDatetime:
-            # GH#19382 for just-barely-OutOfBounds falling back to dateutil
-            # parser will return incorrect result because it will ignore
-            # nanoseconds
-            raise
-
-        except ValueError:
+        string_to_dts_failed = _string_to_dts(
+            ts, &obj.dts, &out_local,
+            &out_tzoffset
+        )
+        if string_to_dts_failed:
             try:
                 ts = parse_datetime_string(ts, dayfirst=dayfirst,
                                            yearfirst=yearfirst)
             except Exception:
                 raise ValueError("could not convert string to Timestamp")
+        else:
+            try:
+                obj.value = dtstruct_to_dt64(&obj.dts)
+                check_dts_bounds(&obj.dts)
+                if out_local == 1:
+                    obj.tzinfo = pytz.FixedOffset(out_tzoffset)
+                    obj.value = tz_convert_single(obj.value, obj.tzinfo, UTC)
+                    if tz is None:
+                        check_dts_bounds(&obj.dts)
+                        check_overflows(obj)
+                        return obj
+                    else:
+                        # Keep the converter same as PyDateTime's
+                        obj = convert_to_tsobject(obj.value, obj.tzinfo,
+                                                None, 0, 0)
+                        dt = datetime(obj.dts.year, obj.dts.month, obj.dts.day,
+                                    obj.dts.hour, obj.dts.min, obj.dts.sec,
+                                    obj.dts.us, obj.tzinfo)
+                        obj = convert_datetime_to_tsobject(
+                            dt, tz, nanos=obj.dts.ps // 1000)
+                        return obj
+
+                else:
+                    ts = obj.value
+                    if tz is not None:
+                        # shift for localize_tso
+                        ts = tz_localize_to_utc(np.array([ts], dtype='i8'), tz,
+                                                ambiguous='raise')[0]
+
+            except OutOfBoundsDatetime:
+                # GH#19382 for just-barely-OutOfBounds falling back to dateutil
+                # parser will return incorrect result because it will ignore
+                # nanoseconds
+                raise
+
+            except ValueError:
+                try:
+                    ts = parse_datetime_string(ts, dayfirst=dayfirst,
+                                               yearfirst=yearfirst)
+                except Exception:
+                    raise ValueError("could not convert string to Timestamp")
 
     return convert_to_tsobject(ts, tz, unit, dayfirst, yearfirst)
 

pandas/_libs/tslibs/np_datetime.pxd

@@ -73,7 +73,4 @@ cdef npy_timedelta get_timedelta64_value(object obj) nogil
 cdef NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil
 
 cdef int _string_to_dts(object val, npy_datetimestruct* dts,
-                        int* out_local, int* out_tzoffset) except? -1
-# see np_datetime.pyx for reasons of second _noexc version
-cdef int _string_to_dts_noexc(object val, npy_datetimestruct* dts,
-                              int* out_local, int* out_tzoffset)
+                        int* out_local, int* out_tzoffset)

pandas/_libs/tslibs/np_datetime.pyx

@@ -1,4 +1,4 @@
-from cpython cimport Py_EQ, Py_NE, Py_GE, Py_GT, Py_LT, Py_LE, PyErr_Clear
+from cpython cimport Py_EQ, Py_NE, Py_GE, Py_GT, Py_LT, Py_LE
 
 from cpython.datetime cimport (datetime, date,
                                PyDateTime_IMPORT,
@@ -31,12 +31,9 @@ cdef extern from "src/datetime/np_datetime.h":
     npy_datetimestruct _NS_MIN_DTS, _NS_MAX_DTS
 
 cdef extern from "src/datetime/np_datetime_strings.h":
-    int parse_iso_8601_datetime(const char *str, int len,
+    int parse_iso_8601_datetime(const char *str, int len, int want_exc,
                                 npy_datetimestruct *out,
                                 int *out_local, int *out_tzoffset)
-    int parse_iso_8601_datetime_noexc(const char *str, int len,
-                                      npy_datetimestruct *out,
-                                      int *out_local, int *out_tzoffset)
 
 
 # ----------------------------------------------------------------------
@@ -173,30 +170,11 @@ cdef inline int64_t pydate_to_dt64(date val, npy_datetimestruct *dts):
 
 
 cdef inline int _string_to_dts(object val, npy_datetimestruct* dts,
-                               int* out_local, int* out_tzoffset) except? -1:
+                               int* out_local, int* out_tzoffset):
     cdef:
         Py_ssize_t length
         const char* buf
 
     buf = get_c_string_buf_and_size(val, &length)
-    return parse_iso_8601_datetime(buf, length,
+    return parse_iso_8601_datetime(buf, length, 0,
                                    dts, out_local, out_tzoffset)
-
-
-# Slightly faster version that doesn't raise a ValueError
-# if a date cannot be parsed, it reports various errors via return result.
-# Caller must check that return value == 0 to determine if parsing succeeded.
-cdef inline int _string_to_dts_noexc(object val, npy_datetimestruct* dts,
-                                     int* out_local, int* out_tzoffset):
-    cdef:
-        Py_ssize_t length
-        const char* buf
-
-    buf = get_c_string_buf_and_size(val, &length)
-    if buf == NULL:
-        PyErr_Clear()
-        return -1
-
-    result = parse_iso_8601_datetime_noexc(buf, length,
-                                           dts, out_local, out_tzoffset);
-    return result

pandas/_libs/tslibs/src/datetime/np_datetime_strings.c

@@ -66,25 +66,7 @@ This file implements string parsing and creation for NumPy datetime.
  *
  * Returns 0 on success, -1 on failure.
  */
-static int __parse_iso_8601_datetime(const char *str, int len, int want_exc,
-                            npy_datetimestruct *out,
-                            int *out_local, int *out_tzoffset);
-
-int parse_iso_8601_datetime(const char *str, int len,
-                            npy_datetimestruct *out,
-                            int *out_local, int *out_tzoffset) {
-    return __parse_iso_8601_datetime(str, len, 1, out, out_local, out_tzoffset);
-}
-
-// slightly faster version of parse_iso_8601_datetime which
-// doesn't set Python exceptions but still returns -1 on error
-int parse_iso_8601_datetime_noexc(const char *str, int len,
-                            npy_datetimestruct *out,
-                            int *out_local, int *out_tzoffset) {
-    return __parse_iso_8601_datetime(str, len, 0, out, out_local, out_tzoffset);
-}
-
-static int __parse_iso_8601_datetime(const char *str, int len, int want_exc,
+int parse_iso_8601_datetime(const char *str, int len, int want_exc,
                             npy_datetimestruct *out,
                             int *out_local, int *out_tzoffset) {
     int year_leap = 0;

pandas/_libs/tslibs/src/datetime/np_datetime_strings.h

@@ -54,17 +54,10 @@ This file implements string parsing and creation for NumPy datetime.
  * Returns 0 on success, -1 on failure.
  */
 int
-parse_iso_8601_datetime(const char *str, int len,
+parse_iso_8601_datetime(const char *str, int len, int want_exc,
                         npy_datetimestruct *out,
                         int *out_local,
                         int *out_tzoffset);
-// slightly faster version of parse_iso_8601_datetime which
-// doesn't set Python exceptions but still returns -1 on error
-int
-parse_iso_8601_datetime_noexc(const char *str, int len,
-                              npy_datetimestruct *out,
-                              int *out_local,
-                              int *out_tzoffset);
 
 /*
  * Provides a string length to use for converting datetime

pandas/tests/tslibs/test_parse_iso8601.py

@@ -46,18 +46,13 @@ def test_parsers_iso8601(date_str, exp):
     "20010101 12345Z",
 ])
 def test_parsers_iso8601_invalid(date_str):
-    msg = "Error parsing datetime string \"{s}\"".format(s=date_str)
-
-    with pytest.raises(ValueError, match=msg):
+    with pytest.raises(ValueError):
         tslib._test_parse_iso8601(date_str)
 
 
 def test_parsers_iso8601_invalid_offset_invalid():
     date_str = "2001-01-01 12-34-56"
-    msg = ("Timezone hours offset out of range "
-           "in datetime string \"{s}\"".format(s=date_str))
-
-    with pytest.raises(ValueError, match=msg):
+    with pytest.raises(ValueError):
         tslib._test_parse_iso8601(date_str)