Skip to content

Commit fbeff86

Browse files
Chang Shewesm
Chang She
authored andcommitted
push exception down to asobject
1 parent dac4d0e commit fbeff86

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

pandas/tseries/index.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -514,9 +514,6 @@ def astype(self, dtype):
514514
dtype = np.dtype(dtype)
515515

516516
if dtype == np.object_:
517-
if isnull(self).any():
518-
msg = 'DatetimeIndex with NaT cannot be converted to object'
519-
raise ValueError(msg)
520517
return self.asobject
521518
return Index.astype(self, dtype)
522519

@@ -536,6 +533,12 @@ def asobject(self):
536533
"""
537534
Convert to Index of datetime objects
538535
"""
536+
if isnull(self).any():
537+
msg = 'DatetimeIndex with NaT cannot be converted to object'
538+
raise ValueError(msg)
539+
return self._get_object_index()
540+
541+
def _get_object_index(self):
539542
boxed_values = _dt_box_array(self.asi8, self.offset, self.tz)
540543
return Index(boxed_values, dtype=object)
541544

@@ -1013,7 +1016,7 @@ def normalize(self):
10131016
return DatetimeIndex(new_values, freq='infer', name=self.name)
10141017

10151018
def __iter__(self):
1016-
return iter(self.asobject)
1019+
return iter(self._get_object_index())
10171020

10181021
def searchsorted(self, key, side='left'):
10191022
if isinstance(key, np.ndarray):

0 commit comments

Comments
 (0)