diff --git a/pandas/core/computation/expr.py b/pandas/core/computation/expr.py index 88a25ad9996a0..babf8116a5588 100644 --- a/pandas/core/computation/expr.py +++ b/pandas/core/computation/expr.py @@ -558,11 +558,11 @@ def visit_Index(self, node, **kwargs): return self.visit(node.value) def visit_Subscript(self, node, **kwargs): - import pandas as pd + from pandas import eval as pd_eval value = self.visit(node.value) slobj = self.visit(node.slice) - result = pd.eval( + result = pd_eval( slobj, local_dict=self.env, engine=self.engine, parser=self.parser ) try: @@ -570,7 +570,7 @@ def visit_Subscript(self, node, **kwargs): v = value.value[result] except AttributeError: # an Op instance - lhs = pd.eval( + lhs = pd_eval( value, local_dict=self.env, engine=self.engine, parser=self.parser ) v = lhs[result] diff --git a/pandas/core/computation/pytables.py b/pandas/core/computation/pytables.py index a8f4f0f2859d2..db2385de06e93 100644 --- a/pandas/core/computation/pytables.py +++ b/pandas/core/computation/pytables.py @@ -12,13 +12,13 @@ from pandas.core.dtypes.common import is_list_like -import pandas as pd import pandas.core.common as com from pandas.core.computation import expr, ops, scope as _scope from pandas.core.computation.common import ensure_decoded from pandas.core.computation.expr import BaseExprVisitor from pandas.core.computation.ops import UndefinedVariableError, is_term from pandas.core.construction import extract_array +from pandas.core.indexes.base import Index from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded @@ -250,7 +250,7 @@ def convert_values(self): class FilterBinOp(BinOp): - filter: Optional[Tuple[Any, Any, pd.Index]] = None + filter: Optional[Tuple[Any, Any, Index]] = None def __repr__(self) -> str: if self.filter is None: @@ -285,7 +285,7 @@ def evaluate(self): if self.op in ["==", "!="] and len(values) > self._max_selectors: filter_op = self.generate_filter_op() - self.filter = (self.lhs, filter_op, pd.Index(values)) + self.filter = (self.lhs, filter_op, Index(values)) return self return None @@ -294,7 +294,7 @@ def evaluate(self): if self.op in ["==", "!="]: filter_op = self.generate_filter_op() - self.filter = (self.lhs, filter_op, pd.Index(values)) + self.filter = (self.lhs, filter_op, Index(values)) else: raise TypeError(