add iso-format support to to_timedelta

fjdiod · Jul 10, 2018 · 3f5f176 · 3f5f176
1 parent 6766d88
commit 3f5f176
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pandas/_libs/tslibs/timedeltas.pyx b/pandas/_libs/tslibs/timedeltas.pyx
@@ -183,7 +183,10 @@ cpdef convert_to_timedelta64(object ts, object unit):
             ts = cast_from_unit(ts, unit)
             ts = np.timedelta64(ts)
     elif is_string_object(ts):
-        ts = np.timedelta64(parse_timedelta_string(ts))
+        if len(ts) > 0 and ts[0] == 'P':
+            ts = np.timedelta64(parse_iso_format_string(ts))
+        else:
+            ts = np.timedelta64(parse_timedelta_string(ts))
     elif hasattr(ts, 'delta'):
         ts = np.timedelta64(delta_to_nanoseconds(ts), 'ns')
 

diff --git a/pandas/io/json/table_schema.py b/pandas/io/json/table_schema.py
@@ -6,7 +6,7 @@
 import warnings
 
 import pandas._libs.json as json
-from pandas import DataFrame, Timedelta
+from pandas import DataFrame, to_timedelta
 from pandas.api.types import CategoricalDtype
 import pandas.core.common as com
 from pandas.core.dtypes.common import (
@@ -308,7 +308,7 @@ def parse_table_schema(json, precise_float):
 
     for col, dtype in dtypes.items():
         if dtype == 'timedelta64[ns]':
-            df[col] = df[col].apply(Timedelta)
+            df[col] = to_timedelta(df[col])
 
     df = df.astype(dtypes)