Merge c27dfb286dc47d2c658ece2b0b03b069fc9735a8 into 044feb537ec7e1278… · pandas-dev/pandas@cd11b49 (original) (raw)

`@@ -9,7 +9,7 @@

`

9

9

`from datetime import datetime, timedelta, date

`

10

10

`import numpy as np

`

11

11

``

12

``

`-

from pandas import Timedelta, Timestamp, DatetimeIndex

`

``

12

`+

from pandas import Timedelta, Timestamp, DatetimeIndex, DataFrame, NaT

`

13

13

``

14

14

`from pandas.core.dtypes.cast import (

`

15

15

`maybe_downcast_to_dtype,

`

`@@ -213,6 +213,13 @@ def test_maybe_convert_scalar(self):

`

213

213

`result = maybe_convert_scalar(Timedelta('1 day 1 min'))

`

214

214

`assert result == Timedelta('1 day 1 min').value

`

215

215

``

``

216

`+

def test_maybe_infer_to_datetimelike(self):

`

``

217

+

``

218

`+

this construction raises IndexError in pandas=0.20.1

`

``

219

`+

result = DataFrame(np.array([[NaT, 'a', 'b', 0],

`

``

220

`+

[NaT, 'c', 'd', 1]]))

`

``

221

`+

assert result.size

`

``

222

+

216

223

``

217

224

`class TestConvert(object):

`

218

225

``