@@ -178,10 +178,6 @@ def wrapper(x):
178
178
179
179
class SafeForSparse (object ):
180
180
181
- @classmethod
182
- def assert_panel_equal (cls , x , y ):
183
- assert_panel_equal (x , y )
184
-
185
181
def test_get_axis (self ):
186
182
assert (self .panel ._get_axis (0 ) is self .panel .items )
187
183
assert (self .panel ._get_axis (1 ) is self .panel .major_axis )
@@ -346,10 +342,10 @@ def check_op(op, name):
346
342
347
343
def test_combinePanel (self ):
348
344
result = self .panel .add (self .panel )
349
- self . assert_panel_equal (result , self .panel * 2 )
345
+ assert_panel_equal (result , self .panel * 2 )
350
346
351
347
def test_neg (self ):
352
- self . assert_panel_equal (- self .panel , self .panel * - 1 )
348
+ assert_panel_equal (- self .panel , self .panel * - 1 )
353
349
354
350
# issue 7692
355
351
def test_raise_when_not_implemented (self ):
@@ -369,22 +365,22 @@ def test_select(self):
369
365
# select items
370
366
result = p .select (lambda x : x in ('ItemA' , 'ItemC' ), axis = 'items' )
371
367
expected = p .reindex (items = ['ItemA' , 'ItemC' ])
372
- self . assert_panel_equal (result , expected )
368
+ assert_panel_equal (result , expected )
373
369
374
370
# select major_axis
375
371
result = p .select (lambda x : x >= datetime (2000 , 1 , 15 ), axis = 'major' )
376
372
new_major = p .major_axis [p .major_axis >= datetime (2000 , 1 , 15 )]
377
373
expected = p .reindex (major = new_major )
378
- self . assert_panel_equal (result , expected )
374
+ assert_panel_equal (result , expected )
379
375
380
376
# select minor_axis
381
377
result = p .select (lambda x : x in ('D' , 'A' ), axis = 2 )
382
378
expected = p .reindex (minor = ['A' , 'D' ])
383
- self . assert_panel_equal (result , expected )
379
+ assert_panel_equal (result , expected )
384
380
385
381
# corner case, empty thing
386
382
result = p .select (lambda x : x in ('foo' , ), axis = 'items' )
387
- self . assert_panel_equal (result , p .reindex (items = []))
383
+ assert_panel_equal (result , p .reindex (items = []))
388
384
389
385
def test_get_value (self ):
390
386
for item in self .panel .items :
@@ -399,8 +395,8 @@ def test_abs(self):
399
395
result = self .panel .abs ()
400
396
result2 = abs (self .panel )
401
397
expected = np .abs (self .panel )
402
- self . assert_panel_equal (result , expected )
403
- self . assert_panel_equal (result2 , expected )
398
+ assert_panel_equal (result , expected )
399
+ assert_panel_equal (result2 , expected )
404
400
405
401
df = self .panel ['ItemA' ]
406
402
result = df .abs ()
@@ -867,10 +863,6 @@ def test_set_value(self):
867
863
class TestPanel (tm .TestCase , PanelTests , CheckIndexing , SafeForLongAndSparse ,
868
864
SafeForSparse ):
869
865
870
- @classmethod
871
- def assert_panel_equal (cls , x , y ):
872
- assert_panel_equal (x , y )
873
-
874
866
def setUp (self ):
875
867
self .panel = _panel .copy ()
876
868
self .panel .major_axis .name = None
@@ -1967,7 +1959,7 @@ def test_round(self):
1967
1959
major_axis = pd .date_range ('1/1/2000' , periods = 5 ),
1968
1960
minor_axis = ['A' , 'B' ])
1969
1961
result = p .round ()
1970
- self . assert_panel_equal (expected , result )
1962
+ assert_panel_equal (expected , result )
1971
1963
1972
1964
def test_numpy_round (self ):
1973
1965
values = [[[- 3.2 , 2.2 ], [0 , - 4.8213 ], [3.123 , 123.12 ],
@@ -1983,7 +1975,7 @@ def test_numpy_round(self):
1983
1975
major_axis = pd .date_range ('1/1/2000' , periods = 5 ),
1984
1976
minor_axis = ['A' , 'B' ])
1985
1977
result = np .round (p )
1986
- self . assert_panel_equal (expected , result )
1978
+ assert_panel_equal (expected , result )
1987
1979
1988
1980
msg = "the 'out' parameter is not supported"
1989
1981
tm .assertRaisesRegexp (ValueError , msg , np .round , p , out = p )
@@ -2270,15 +2262,12 @@ def test_all_any_unhandled(self):
2270
2262
self .assertRaises (NotImplementedError , self .panel .any , bool_only = True )
2271
2263
2272
2264
2273
- class TestLongPanel (tm .TestCase ):
2265
+ class TestPanelFrame (tm .TestCase ):
2274
2266
"""
2275
- LongPanel no longer exists, but.. .
2267
+ Check that conversions to and from Panel to DataFrame work .
2276
2268
"""
2277
2269
2278
2270
def setUp (self ):
2279
- import warnings
2280
- warnings .filterwarnings (action = 'ignore' , category = FutureWarning )
2281
-
2282
2271
panel = tm .makePanel ()
2283
2272
tm .add_nans (panel )
2284
2273
0 commit comments