Merge c27dfb2 into 044feb5

Author: RobinFiveWords

pandas/core/dtypes/cast.py

@@ -837,7 +837,7 @@ def try_timedelta(v):
         try:
             return to_timedelta(v)._values.reshape(shape)
         except:
-            return v
+            return v.reshape(shape)
 
     inferred_type = lib.infer_datetimelike_array(_ensure_object(v))
 

pandas/tests/dtypes/test_cast.py

@@ -9,7 +9,7 @@
 from datetime import datetime, timedelta, date
 import numpy as np
 
-from pandas import Timedelta, Timestamp, DatetimeIndex
+from pandas import Timedelta, Timestamp, DatetimeIndex, DataFrame, NaT
 
 from pandas.core.dtypes.cast import (
     maybe_downcast_to_dtype,
@@ -213,6 +213,13 @@ def test_maybe_convert_scalar(self):
         result = maybe_convert_scalar(Timedelta('1 day 1 min'))
         assert result == Timedelta('1 day 1 min').value
 
+    def test_maybe_infer_to_datetimelike(self):
+
+        # this construction raises IndexError in pandas=0.20.1
+        result = DataFrame(np.array([[NaT, 'a', 'b', 0],
+                                     [NaT, 'c', 'd', 1]]))
+        assert result.size
+
 
 class TestConvert(object):