Merge pull request #3205 from jreback/tests_fix

TST: fix tests in master

Author: jreback

pandas/sparse/frame.py

@@ -329,7 +329,23 @@ def _set_columns(self, cols):
         if len(cols) != len(self._series):
             raise Exception('Columns length %d did not match data %d!' %
                             (len(cols), len(self._series)))
-        self._columns = _ensure_index(cols)
+
+        cols = _ensure_index(cols)
+
+        # rename the _series if needed
+        existing = getattr(self,'_columns',None)
+        if existing is not None and len(existing) == len(cols):
+
+            new_series = {}
+            for i, col in enumerate(existing):
+                new_col = cols[i]
+                if new_col in new_series:  # pragma: no cover
+                    raise Exception('Non-unique mapping!')
+                new_series[new_col] = self._series.get(col)
+
+            self._series = new_series
+
+        self._columns = cols
 
     index = property(fget=_get_index, fset=_set_index)
     columns = property(fget=_get_columns, fset=_set_columns)
@@ -619,7 +635,7 @@ def _reindex_with_indexers(self, index, row_indexer, columns, col_indexer,
 
     def _rename_index_inplace(self, mapper):
         self.index = [mapper(x) for x in self.index]
-
+ 
     def _rename_columns_inplace(self, mapper):
         new_series = {}
         new_columns = []

pandas/tseries/period.py

@@ -136,6 +136,9 @@ def __eq__(self, other):
             raise TypeError(other)
         return False
 
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
     def __hash__(self):
         return hash((self.ordinal, self.freq))