Skip to content

Commit d512b31

Browse files
authored
CLN: remove pd import in pandas/core/computation (#39268)
* CLN: avoid pd import in computation/expr.py * CLN: avoid pd import in computation/pytables
1 parent 02e2f6a commit d512b31

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

pandas/core/computation/expr.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -558,19 +558,19 @@ def visit_Index(self, node, **kwargs):
558558
return self.visit(node.value)
559559

560560
def visit_Subscript(self, node, **kwargs):
561-
import pandas as pd
561+
from pandas import eval as pd_eval
562562

563563
value = self.visit(node.value)
564564
slobj = self.visit(node.slice)
565-
result = pd.eval(
565+
result = pd_eval(
566566
slobj, local_dict=self.env, engine=self.engine, parser=self.parser
567567
)
568568
try:
569569
# a Term instance
570570
v = value.value[result]
571571
except AttributeError:
572572
# an Op instance
573-
lhs = pd.eval(
573+
lhs = pd_eval(
574574
value, local_dict=self.env, engine=self.engine, parser=self.parser
575575
)
576576
v = lhs[result]

pandas/core/computation/pytables.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
from pandas.core.dtypes.common import is_list_like
1414

15-
import pandas as pd
1615
import pandas.core.common as com
1716
from pandas.core.computation import expr, ops, scope as _scope
1817
from pandas.core.computation.common import ensure_decoded
1918
from pandas.core.computation.expr import BaseExprVisitor
2019
from pandas.core.computation.ops import UndefinedVariableError, is_term
2120
from pandas.core.construction import extract_array
21+
from pandas.core.indexes.base import Index
2222

2323
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
2424

@@ -250,7 +250,7 @@ def convert_values(self):
250250

251251

252252
class FilterBinOp(BinOp):
253-
filter: Optional[Tuple[Any, Any, pd.Index]] = None
253+
filter: Optional[Tuple[Any, Any, Index]] = None
254254

255255
def __repr__(self) -> str:
256256
if self.filter is None:
@@ -285,7 +285,7 @@ def evaluate(self):
285285
if self.op in ["==", "!="] and len(values) > self._max_selectors:
286286

287287
filter_op = self.generate_filter_op()
288-
self.filter = (self.lhs, filter_op, pd.Index(values))
288+
self.filter = (self.lhs, filter_op, Index(values))
289289

290290
return self
291291
return None
@@ -294,7 +294,7 @@ def evaluate(self):
294294
if self.op in ["==", "!="]:
295295

296296
filter_op = self.generate_filter_op()
297-
self.filter = (self.lhs, filter_op, pd.Index(values))
297+
self.filter = (self.lhs, filter_op, Index(values))
298298

299299
else:
300300
raise TypeError(

0 commit comments

Comments
 (0)