Revert "Revert "MAINT: Remove Long and WidePanel (pandas-dev#15748)" (pandas-dev#15802)"

This reverts commit 22f9d0d.

Author: gfyoung

asv_bench/benchmarks/pandas_vb_common.py

@@ -23,11 +23,6 @@
     except:
         pass
 
-try:
-    Panel = Panel
-except Exception:
-    Panel = WidePanel
-
 # didn't add to namespace until later
 try:
     from pandas.core.index import MultiIndex

pandas/core/api.py

@@ -21,7 +21,7 @@
 
 from pandas.core.series import Series
 from pandas.core.frame import DataFrame
-from pandas.core.panel import Panel, WidePanel
+from pandas.core.panel import Panel
 from pandas.core.panel4d import Panel4D
 from pandas.core.reshape.reshape import (
     pivot_simple as pivot, get_dummies)

pandas/core/panel.py

@@ -1617,24 +1617,3 @@ def f(self, other, axis=0):
 ops.add_special_arithmetic_methods(Panel, **ops.panel_special_funcs)
 Panel._add_aggregate_operations()
 Panel._add_numeric_operations()
-
-
-# legacy
-class WidePanel(Panel):
-
-    def __init__(self, *args, **kwargs):
-        # deprecation, #10892
-        warnings.warn("WidePanel is deprecated. Please use Panel",
-                      FutureWarning, stacklevel=2)
-
-        super(WidePanel, self).__init__(*args, **kwargs)
-
-
-class LongPanel(DataFrame):
-
-    def __init__(self, *args, **kwargs):
-        # deprecation, #10892
-        warnings.warn("LongPanel is deprecated. Please use DataFrame",
-                      FutureWarning, stacklevel=2)
-
-        super(LongPanel, self).__init__(*args, **kwargs)

pandas/tests/api/test_api.py

@@ -51,8 +51,8 @@ class TestPDApi(Base):
                'TimedeltaIndex', 'Timestamp', 'Interval', 'IntervalIndex']
 
     # these are already deprecated; awaiting removal
-    deprecated_classes = ['WidePanel', 'Panel4D', 'TimeGrouper',
-                          'SparseList', 'Expr', 'Term']
+    deprecated_classes = ['Panel4D',
+                         'TimeGrouper', 'SparseList', 'Expr', 'Term']
 
     # these should be deprecated in the future
     deprecated_classes_in_future = ['Panel']

pandas/tests/io/test_pytables.py

@@ -3145,9 +3145,6 @@ def _check(left, right):
             wp = tm.makePanel()
             self._check_roundtrip(wp.to_frame(), _check)
 
-    def test_longpanel(self):
-        pass
-
     def test_overwrite_node(self):
 
         with ensure_clean_store(self.path) as store:

pandas/tests/test_panel.py

@@ -184,10 +184,6 @@ def wrapper(x):
 
 class SafeForSparse(object):
 
-    @classmethod
-    def assert_panel_equal(cls, x, y):
-        assert_panel_equal(x, y)
-
     def test_get_axis(self):
         assert (self.panel._get_axis(0) is self.panel.items)
         assert (self.panel._get_axis(1) is self.panel.major_axis)
@@ -353,13 +349,11 @@ def check_op(op, name):
                     raise
 
     def test_combinePanel(self):
-        with catch_warnings(record=True):
-            result = self.panel.add(self.panel)
-            assert_panel_equal(result, self.panel * 2)
+        with catch_warnings(record=True):result = self.panel.add(self.panel)
+        assert_panel_equal(result, self.panel * 2)
 
     def test_neg(self):
-        with catch_warnings(record=True):
-            assert_panel_equal(-self.panel, self.panel * -1)
+        assert_panel_equal(-self.panel, self.panel * -1)
 
     # issue 7692
     def test_raise_when_not_implemented(self):
@@ -379,26 +373,25 @@ def test_select(self):
         with catch_warnings(record=True):
             p = self.panel
 
-            # select items
-            result = p.select(lambda x: x in ('ItemA', 'ItemC'), axis='items')
-            expected = p.reindex(items=['ItemA', 'ItemC'])
-            assert_panel_equal(result, expected)
+        # select items
+        result = p.select(lambda x: x in ('ItemA', 'ItemC'), axis='items')
+        expected = p.reindex(items=['ItemA', 'ItemC'])
+        assert_panel_equal(result, expected)
 
-            # select major_axis
-            result = p.select(lambda x: x >= datetime(
-                2000, 1, 15), axis='major')
-            new_major = p.major_axis[p.major_axis >= datetime(2000, 1, 15)]
-            expected = p.reindex(major=new_major)
-            assert_panel_equal(result, expected)
+        # select major_axis
+        result = p.select(lambda x: x >= datetime(2000, 1, 15), axis='major')
+        new_major = p.major_axis[p.major_axis >= datetime(2000, 1, 15)]
+        expected = p.reindex(major=new_major)
+        assert_panel_equal(result, expected)
 
-            # select minor_axis
-            result = p.select(lambda x: x in ('D', 'A'), axis=2)
-            expected = p.reindex(minor=['A', 'D'])
-            assert_panel_equal(result, expected)
+        # select minor_axis
+        result = p.select(lambda x: x in ('D', 'A'), axis=2)
+        expected = p.reindex(minor=['A', 'D'])
+        assert_panel_equal(result, expected)
 
-            # corner case, empty thing
-            result = p.select(lambda x: x in ('foo', ), axis='items')
-            assert_panel_equal(result, p.reindex(items=[]))
+        # corner case, empty thing
+        result = p.select(lambda x: x in ('foo', ), axis='items')
+        assert_panel_equal(result, p.reindex(items=[]))
 
     def test_get_value(self):
         for item in self.panel.items:
@@ -412,12 +405,11 @@ def test_get_value(self):
 
     def test_abs(self):
 
-        with catch_warnings(record=True):
-            result = self.panel.abs()
-            result2 = abs(self.panel)
-            expected = np.abs(self.panel)
-            assert_panel_equal(result, expected)
-            assert_panel_equal(result2, expected)
+        with catch_warnings(record=True):result = self.panel.abs()
+        result2 = abs(self.panel)
+        expected = np.abs(self.panel)
+        assert_panel_equal(result, expected)
+        assert_panel_equal(result2, expected)
 
             df = self.panel['ItemA']
             result = df.abs()
@@ -906,10 +898,6 @@ def test_set_value(self):
 class TestPanel(PanelTests, CheckIndexing, SafeForLongAndSparse,
                 SafeForSparse):
 
-    @classmethod
-    def assert_panel_equal(cls, x, y):
-        assert_panel_equal(x, y)
-
     def setup_method(self, method):
         self.panel = make_test_panel()
         self.panel.major_axis.name = None
@@ -2103,38 +2091,36 @@ def test_pct_change(self):
             assert_panel_equal(result, expected)
 
     def test_round(self):
-        with catch_warnings(record=True):
-            values = [[[-3.2, 2.2], [0, -4.8213], [3.123, 123.12],
-                       [-1566.213, 88.88], [-12, 94.5]],
-                      [[-5.82, 3.5], [6.21, -73.272], [-9.087, 23.12],
-                       [272.212, -99.99], [23, -76.5]]]
-            evalues = [[[float(np.around(i)) for i in j] for j in k]
-                       for k in values]
-            p = Panel(values, items=['Item1', 'Item2'],
-                      major_axis=date_range('1/1/2000', periods=5),
-                      minor_axis=['A', 'B'])
-            expected = Panel(evalues, items=['Item1', 'Item2'],
-                             major_axis=date_range('1/1/2000', periods=5),
-                             minor_axis=['A', 'B'])
-            result = p.round()
-            assert_panel_equal(expected, result)
+        with catch_warnings(record=True):values = [[[-3.2, 2.2], [0, -4.8213], [3.123, 123.12],
+                   [-1566.213, 88.88], [-12, 94.5]],
+                  [[-5.82, 3.5], [6.21, -73.272], [-9.087, 23.12],
+                   [272.212, -99.99], [23, -76.5]]]
+        evalues = [[[float(np.around(i)) for i in j] for j in k]
+                   for k in values]
+        p = Panel(values, items=['Item1', 'Item2'],
+                  major_axis=date_range('1/1/2000', periods=5),
+                  minor_axis=['A', 'B'])
+        expected = Panel(evalues, items=['Item1', 'Item2'],
+                         major_axis=date_range('1/1/2000', periods=5),
+                         minor_axis=['A', 'B'])
+        result = p.round()
+        assert_panel_equal(expected, result)
 
     def test_numpy_round(self):
-        with catch_warnings(record=True):
-            values = [[[-3.2, 2.2], [0, -4.8213], [3.123, 123.12],
-                       [-1566.213, 88.88], [-12, 94.5]],
-                      [[-5.82, 3.5], [6.21, -73.272], [-9.087, 23.12],
-                       [272.212, -99.99], [23, -76.5]]]
-            evalues = [[[float(np.around(i)) for i in j] for j in k]
-                       for k in values]
-            p = Panel(values, items=['Item1', 'Item2'],
-                      major_axis=date_range('1/1/2000', periods=5),
-                      minor_axis=['A', 'B'])
-            expected = Panel(evalues, items=['Item1', 'Item2'],
-                             major_axis=date_range('1/1/2000', periods=5),
-                             minor_axis=['A', 'B'])
-            result = np.round(p)
-            assert_panel_equal(expected, result)
+        with catch_warnings(record=True):values = [[[-3.2, 2.2], [0, -4.8213], [3.123, 123.12],
+                   [-1566.213, 88.88], [-12, 94.5]],
+                  [[-5.82, 3.5], [6.21, -73.272], [-9.087, 23.12],
+                   [272.212, -99.99], [23, -76.5]]]
+        evalues = [[[float(np.around(i)) for i in j] for j in k]
+                   for k in values]
+        p = Panel(values, items=['Item1', 'Item2'],
+                  major_axis=date_range('1/1/2000', periods=5),
+                  minor_axis=['A', 'B'])
+        expected = Panel(evalues, items=['Item1', 'Item2'],
+                         major_axis=date_range('1/1/2000', periods=5),
+                         minor_axis=['A', 'B'])
+        result = np.round(p)
+        assert_panel_equal(expected, result)
 
             msg = "the 'out' parameter is not supported"
             tm.assert_raises_regex(ValueError, msg, np.round, p, out=p)
@@ -2461,13 +2447,15 @@ def test_sort_values(self):
         pytest.raises(NotImplementedError, self.panel.sort_values, 'ItemA')
 
 
-class TestLongPanel(object):
+class TestPanelFrame(object):
     """
-    LongPanel no longer exists, but...
+    Check that conversions to and from Panel to DataFrame work.
     """
 
-    def setup_method(self, method):
-        panel = make_test_panel()
+    def setUp(self):
+        panel = tm.makePanel()
+        tm.add_nans(panel)
+
         self.panel = panel.to_frame()
         self.unfiltered_panel = panel.to_frame(filter_observations=False)