Skip to content

Commit 2a915bc

Browse files
committed
CLN: move pandas.computation -> pandas.core.computation
1 parent da408cc commit 2a915bc

32 files changed

+79
-73
lines changed

asv_bench/benchmarks/binary_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from .pandas_vb_common import *
2-
import pandas.computation.expressions as expr
2+
import pandas.core.computation.expressions as expr
33

44

55
class Ops(object):

asv_bench/benchmarks/eval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .pandas_vb_common import *
22
import pandas as pd
3-
import pandas.computation.expressions as expr
3+
import pandas.core.computation.expressions as expr
44

55

66
class Eval(object):

asv_bench/benchmarks/indexing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from .pandas_vb_common import *
22
try:
3-
import pandas.computation.expressions as expr
3+
import pandas.core.computation.expressions as expr
44
except:
55
expr = None
66

doc/source/whatsnew/v0.20.0.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ If indicated, a deprecation warning will be issued if you reference that module.
10171017
"pandas.tslib", "pandas._libs.tslib", "X"
10181018
"pandas._join", "pandas._libs.join", ""
10191019
"pandas._period", "pandas._libs.period", ""
1020+
"pandas.computation", "pandas.core.computation", ""
10201021
"pandas.msgpack", "pandas.io.msgpack", ""
10211022
"pandas.index", "pandas._libs.index", ""
10221023
"pandas.algos", "pandas._libs.algos", ""

pandas/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
from pandas.sparse.api import *
4444
from pandas.stats.api import *
4545
from pandas.tseries.api import *
46-
from pandas.computation.api import *
46+
from pandas.core.computation.api import *
4747

4848
from pandas.tools.concat import concat
4949
from pandas.tools.merge import (merge, ordered_merge,
File renamed without changes.

pandas/computation/align.py renamed to pandas/core/computation/align.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from pandas import compat
1212
from pandas.errors import PerformanceWarning
1313
from pandas.core.common import flatten
14-
from pandas.computation.common import _result_type_many
14+
from pandas.core.computation.common import _result_type_many
1515

1616

1717
def _align_core_single_unary_op(term):
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# flake8: noqa
22

3-
from pandas.computation.eval import eval
3+
from pandas.core.computation.eval import eval
44

55

66
# deprecation, xref #13790
@@ -10,5 +10,5 @@ def Expr(*args, **kwargs):
1010
warnings.warn("pd.Expr is deprecated as it is not "
1111
"applicable to user code",
1212
FutureWarning, stacklevel=2)
13-
from pandas.computation.expr import Expr
13+
from pandas.core.computation.expr import Expr
1414
return Expr(*args, **kwargs)
File renamed without changes.

pandas/computation/engines.py renamed to pandas/core/computation/engines.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
from pandas import compat
88
from pandas.compat import map
99
import pandas.formats.printing as printing
10-
from pandas.computation.align import _align, _reconstruct_object
11-
from pandas.computation.ops import (UndefinedVariableError,
12-
_mathops, _reductions)
10+
from pandas.core.computation.align import _align, _reconstruct_object
11+
from pandas.core.computation.ops import (
12+
UndefinedVariableError,
13+
_mathops, _reductions)
1314

1415

1516
_ne_builtins = frozenset(_mathops + _reductions)

0 commit comments

Comments
 (0)