ENH: pickle support for Period pandas-dev#10439

update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo ENH: pickle support for Period pandas-dev#10439 update legacy_storage for pickles update pickles/msgpack for 0.16.2 Added tests for ABC Types, Issue pandas-dev#10828 TST: pandas-dev#10822, skip tests on windows for odd error message in to_datetime with unicode COMPAT:Allow multi-indexes to be written to excel. (Even though they cannot be read back in.) Closes pandas-dev#10564 DOC: typo A few changes in docs
springcoil · Aug 22, 2015 · 535fbd2 · 535fbd2
1 parent 923e11d
commit 535fbd2
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/pandas/io/tests/generate_legacy_storage_files.py b/pandas/io/tests/generate_legacy_storage_files.py
@@ -83,9 +83,20 @@ def create_data():
                             index=MultiIndex.from_tuples(tuple(zip(*[[1, 1, 2, 2, 2], [3, 4, 3, 4, 5]])),
                                                          names=['one', 'two'])),
                   dup=Series(np.arange(5).astype(np.float64), index=['A', 'B', 'C', 'D', 'A']),
+<<<<<<< HEAD
+<<<<<<< HEAD
                   cat=Series(Categorical(['foo', 'bar', 'baz'])))
     if LooseVersion(pandas.__version__) >= '0.17.0':
         series['period'] = Series([Period('2000Q1')] * 5)
+=======
+                  cat=Series(Categorical(['foo', 'bar', 'baz'])),
+                  per=Series([Period('2000Q1')] * 5))
+>>>>>>> 0525684... ENH: pickle support for Period #10439
+=======
+                  cat=Series(Categorical(['foo', 'bar', 'baz'])))
+    if LooseVersion(pandas.__version__) >= '0.17.0':
+        series['period'] = Series([Period('2000Q1')] * 5)
+>>>>>>> aa04812... update legacy_storage for pickles
 
     mixed_dup_df = DataFrame(data)
     mixed_dup_df.columns = list("ABCDA")

diff --git a/pandas/tseries/tests/test_period.py b/pandas/tseries/tests/test_period.py
@@ -2537,7 +2537,17 @@ def test_searchsorted(self):
 
     def test_round_trip(self):
 
+<<<<<<< HEAD
+<<<<<<< HEAD
         p = Period('2000Q1')
+=======
+        import pickle
+        p = Period('2000Q1')
+
+>>>>>>> 0525684... ENH: pickle support for Period #10439
+=======
+        p = Period('2000Q1')
+>>>>>>> aa04812... update legacy_storage for pickles
         new_p = self.round_trip_pickle(p)
         self.assertEqual(new_p, p)