Merge branch 'datetime-index-insert-non-datetimes' of https://github.com/jtratner/pandas into jtratner-datetime-index-insert-non-datetimes

Conflicts:
	doc/source/release.rst

Author: jreback

doc/source/release.rst

@@ -147,6 +147,7 @@ Bug Fixes
     (:issue:`6043`)
   - Regression in ``.get(None)`` indexing from 0.12 (:issue:`5652`)
   - Subtle ``iloc`` indexing bug, surfaced in (:issue:`6059`)
+  - Bug with insert of strings into DatetimeIndex (:issue:`5818`)
 
 pandas 0.13.0
 -------------

pandas/core/indexing.py

@@ -1423,7 +1423,6 @@ def _safe_append_to_index(index, key):
 
         # raise here as this is basically an unsafe operation and we want
         # it to be obvious that you are doing something wrong
-
         raise ValueError("unsafe appending to index of type {0} with a key "
                          "{1}".format(index.__class__.__name__, key))
 

pandas/sparse/tests/test_sparse.py

@@ -1084,8 +1084,10 @@ def test_icol(self):
 
     def test_set_value(self):
 
-        # this is invalid because it is not a valid type for this index
-        self.assertRaises(ValueError, self.frame.set_value, 'foobar', 'B', 1.5)
+        # ok as the index gets conver to object
+        frame = self.frame.copy()
+        res = frame.set_value('foobar', 'B', 1.5)
+        self.assert_(res.index.dtype == 'object')
 
         res = self.frame
         res.index = res.index.astype(object)

pandas/tests/test_frame.py

@@ -10968,6 +10968,19 @@ def test_reset_index_multiindex_col(self):
                                 ['a', 'mean', 'median', 'mean']])
         assert_frame_equal(rs, xp)
 
+    def test_reset_index_with_datetimeindex_cols(self):
+        # GH5818
+        #
+        df = pd.DataFrame([[1, 2], [3, 4]],
+                          columns=pd.date_range('1/1/2013', '1/2/2013'),
+                          index=['A', 'B'])
+
+        result = df.reset_index()
+        expected = pd.DataFrame([['A', 1, 2], ['B', 3, 4]],
+                          columns=['index', datetime(2013, 1, 1),
+                                   datetime(2013, 1, 2)])
+        assert_frame_equal(result, expected)
+
     #----------------------------------------------------------------------
     # Tests to cope with refactored internals
     def test_as_matrix_numeric_cols(self):

pandas/tests/test_indexing.py

@@ -1809,15 +1809,13 @@ def test_partial_set_invalid(self):
 
         df = tm.makeTimeDataFrame()
 
+        # don't allow not string inserts
         def f():
             df.loc[100.0, :] = df.ix[0]
         self.assertRaises(ValueError, f)
         def f():
             df.loc[100,:] = df.ix[0]
         self.assertRaises(ValueError, f)
-        def f():
-            df.loc['a',:] = df.ix[0]
-        self.assertRaises(ValueError, f)
 
         def f():
             df.ix[100.0, :] = df.ix[0]
@@ -1826,6 +1824,9 @@ def f():
             df.ix[100,:] = df.ix[0]
         self.assertRaises(ValueError, f)
 
+        # allow object conversion here
+        df.loc['a',:] = df.ix[0]
+
     def test_partial_set_empty(self):
 
         # GH5226

pandas/tseries/index.py

@@ -1525,18 +1525,26 @@ def insert(self, loc, item):
         ----------
         loc : int
         item : object
+            if not either a Python datetime or a numpy integer-like, returned
+            Index dtype will be object rather than datetime.
 
         Returns
         -------
         new_index : Index
         """
         if isinstance(item, datetime):
             item = _to_m8(item, tz=self.tz)
-
-        new_index = np.concatenate((self[:loc].asi8,
+        try:
+            new_index = np.concatenate((self[:loc].asi8,
                                     [item.view(np.int64)],
                                     self[loc:].asi8))
-        return DatetimeIndex(new_index, freq='infer')
+            return DatetimeIndex(new_index, freq='infer')
+        except (AttributeError, TypeError):
+
+            # fall back to object index
+            if isinstance(item,compat.string_types):
+                return self.asobject.insert(loc, item)
+            raise TypeError("cannot insert DatetimeIndex with incompatible label")
 
     def delete(self, loc):
         """
@@ -1577,7 +1585,7 @@ def tz_convert(self, tz):
     def tz_localize(self, tz, infer_dst=False):
         """
         Localize tz-naive DatetimeIndex to given time zone (using pytz)
-       
+
         Parameters
         ----------
         tz : string or pytz.timezone

pandas/tseries/tests/test_timeseries.py

@@ -2038,6 +2038,13 @@ def test_insert(self):
                              '2000-01-02'])
         self.assert_(result.equals(exp))
 
+        # insertion of non-datetime should coerce to object index
+        result = idx.insert(1, 'inserted')
+        expected = Index([datetime(2000, 1, 4), 'inserted', datetime(2000, 1, 1),
+                          datetime(2000, 1, 2)])
+        self.assert_(not isinstance(result, DatetimeIndex))
+        tm.assert_index_equal(result, expected)
+
         idx = date_range('1/1/2000', periods=3, freq='M')
         result = idx.insert(3, datetime(2000, 4, 30))
         self.assert_(result.freqstr == 'M')