Skip to content

TST: Fix test_eval.py #6074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2014
Merged

TST: Fix test_eval.py #6074

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pandas/computation/tests/test_eval.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,8 @@ def check_complex_cmp_op(self, lhs, cmp1, rhs, binop, cmp2):
local_dict={'lhs': lhs, 'rhs': rhs},
engine=self.engine, parser=self.parser)
elif _bool_and_frame(lhs, rhs):
self.assertRaises(TypeError, _eval_single_bin, lhs_new, '&',
rhs_new, self.engine)
self.assertRaises(TypeError, _eval_single_bin, lhs, '&',
rhs, self.engine)
self.assertRaises(TypeError, pd.eval, ex,
local_dict={'lhs': lhs, 'rhs': rhs},
engine=self.engine, parser=self.parser)
Expand Down Expand Up @@ -281,7 +281,7 @@ def check_operands(left, right, cmp_op):
ex2 = 'lhs {0} mid and mid {1} rhs'.format(cmp1, cmp2)
ex3 = '(lhs {0} mid) & (mid {1} rhs)'.format(cmp1, cmp2)
for ex in (ex1, ex2, ex3):
with assertRaises(NotImplementedError):
with tm.assertRaises(NotImplementedError):
pd.eval(ex, engine=self.engine, parser=self.parser)
return
if (np.isscalar(right) and not np.isscalar(left) and cmp_op in
Expand Down