Skip to content

Commit ff8b250

Browse files
committed
TST: removes expected raises for unary pos from eval tests
1 parent 122fcd6 commit ff8b250

File tree

1 file changed

+18
-42
lines changed

1 file changed

+18
-42
lines changed

pandas/tests/computation/test_eval.py

+18-42
Original file line numberDiff line numberDiff line change
@@ -542,66 +542,42 @@ def test_frame_pos(self):
542542

543543
# float
544544
lhs = DataFrame(randn(5, 2))
545-
if self.engine == 'python':
546-
with pytest.raises(TypeError):
547-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
548-
else:
549-
expect = lhs
550-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
551-
assert_frame_equal(expect, result)
545+
expect = lhs
546+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
547+
assert_frame_equal(expect, result)
552548

553549
# int
554550
lhs = DataFrame(randint(5, size=(5, 2)))
555-
if self.engine == 'python':
556-
with pytest.raises(TypeError):
557-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
558-
else:
559-
expect = lhs
560-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
561-
assert_frame_equal(expect, result)
551+
expect = lhs
552+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
553+
assert_frame_equal(expect, result)
562554

563555
# bool doesn't work with numexpr but works elsewhere
564556
lhs = DataFrame(rand(5, 2) > 0.5)
565-
if self.engine == 'python':
566-
with pytest.raises(TypeError):
567-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
568-
else:
569-
expect = lhs
570-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
571-
assert_frame_equal(expect, result)
557+
expect = lhs
558+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
559+
assert_frame_equal(expect, result)
572560

573561
def test_series_pos(self):
574562
expr = self.ex('+')
575563

576564
# float
577565
lhs = Series(randn(5))
578-
if self.engine == 'python':
579-
with pytest.raises(TypeError):
580-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
581-
else:
582-
expect = lhs
583-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
584-
assert_series_equal(expect, result)
566+
expect = lhs
567+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
568+
assert_series_equal(expect, result)
585569

586570
# int
587571
lhs = Series(randint(5, size=5))
588-
if self.engine == 'python':
589-
with pytest.raises(TypeError):
590-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
591-
else:
592-
expect = lhs
593-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
594-
assert_series_equal(expect, result)
572+
expect = lhs
573+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
574+
assert_series_equal(expect, result)
595575

596576
# bool doesn't work with numexpr but works elsewhere
597577
lhs = Series(rand(5) > 0.5)
598-
if self.engine == 'python':
599-
with pytest.raises(TypeError):
600-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
601-
else:
602-
expect = lhs
603-
result = pd.eval(expr, engine=self.engine, parser=self.parser)
604-
assert_series_equal(expect, result)
578+
expect = lhs
579+
result = pd.eval(expr, engine=self.engine, parser=self.parser)
580+
assert_series_equal(expect, result)
605581

606582
def test_scalar_unary(self):
607583
with pytest.raises(TypeError):

0 commit comments

Comments
 (0)