Skip to content

Commit 4239ef5

Browse files
committed
CLN: move remaning extensions to _libs
1 parent 8d7fa0d commit 4239ef5

31 files changed

+58
-58
lines changed

asv_bench/benchmarks/algorithms.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import pandas as pd
66
from pandas.util import testing as tm
77

8-
for imp in ['pandas.util.hashing', 'pandas.tools.hashing']:
8+
for imp in ['pandas.util', 'pandas.tools.hashing']:
99
try:
1010
hashing = import_module(imp)
1111
break

doc/source/whatsnew/v0.20.0.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1230,19 +1230,19 @@ If indicated, a deprecation warning will be issued if you reference theses modul
12301230
"pandas.algos", "pandas._libs.algos", ""
12311231
"pandas.hashtable", "pandas._libs.hashtable", ""
12321232
"pandas.indexes", "pandas.core.indexes", ""
1233-
"pandas.json", "pandas.io.json.libjson", "X"
1234-
"pandas.parser", "pandas.io.libparsers", "X"
1233+
"pandas.json", "pandas._libs.json", "X"
1234+
"pandas.parser", "pandas._libs.parsers", "X"
12351235
"pandas.formats", "pandas.io.formats", ""
12361236
"pandas.sparse", "pandas.core.sparse", ""
12371237
"pandas.tools", "pandas.core.reshape", ""
12381238
"pandas.types", "pandas.core.dtypes", ""
1239-
"pandas.io.sas.saslib", "pandas.io.sas.libsas", ""
1239+
"pandas.io.sas.saslib", "pandas.io.sas._sas", ""
12401240
"pandas._join", "pandas._libs.join", ""
12411241
"pandas._hash", "pandas._libs.hashing", ""
12421242
"pandas._period", "pandas._libs.period", ""
1243-
"pandas._sparse", "pandas.core.sparse.libsparse", ""
1244-
"pandas._testing", "pandas.util._testing", ""
1245-
"pandas._window", "pandas.core.libwindow", ""
1243+
"pandas._sparse", "pandas._libs.sparse", ""
1244+
"pandas._testing", "pandas._libs.testing", ""
1245+
"pandas._window", "pandas._libs.window", ""
12461246

12471247

12481248
Some new subpackages are created with public functionality that is not directly
File renamed without changes.
File renamed without changes.

pandas/_libs/src/ujson/python/ujson.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,14 @@ static struct PyModuleDef moduledef = {
9090
NULL /* m_free */
9191
};
9292

93-
#define PYMODINITFUNC PyMODINIT_FUNC PyInit_libjson(void)
93+
#define PYMODINITFUNC PyMODINIT_FUNC PyInit_json(void)
9494
#define PYMODULE_CREATE() PyModule_Create(&moduledef)
9595
#define MODINITERROR return NULL
9696

9797
#else
9898

99-
#define PYMODINITFUNC PyMODINIT_FUNC initlibjson(void)
100-
#define PYMODULE_CREATE() Py_InitModule("libjson", ujsonMethods)
99+
#define PYMODINITFUNC PyMODINIT_FUNC initjson(void)
100+
#define PYMODULE_CREATE() Py_InitModule("json", ujsonMethods)
101101
#define MODINITERROR return
102102

103103
#endif
File renamed without changes.

pandas/compat/pickle_compat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def load_reduce(self):
7171

7272
# 12588, extensions moving
7373
('pandas._sparse', 'BlockIndex'):
74-
('pandas.core.sparse.libsparse', 'BlockIndex'),
74+
('pandas._libs.sparse', 'BlockIndex'),
7575
('pandas.tslib', 'Timestamp'):
7676
('pandas._libs.tslib', 'Timestamp'),
7777
('pandas.tslib', '__nat_unpickle'):

pandas/core/reshape/reshape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
from pandas.core.sparse.api import SparseDataFrame, SparseSeries
2222
from pandas.core.sparse.array import SparseArray
23-
from pandas.core.sparse.libsparse import IntIndex
23+
from pandas._libs.sparse import IntIndex
2424

2525
from pandas.core.categorical import Categorical, _factorize_from_iterable
2626
from pandas.core.sorting import (get_group_index, get_compressed_ids,

pandas/core/sparse/array.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
astype_nansafe, find_common_type)
3030
from pandas.core.dtypes.missing import isnull, notnull, na_value_for_dtype
3131

32-
from pandas.core.sparse import libsparse as splib
33-
from pandas.core.sparse.libsparse import SparseIndex, BlockIndex, IntIndex
32+
import pandas._libs.sparse as splib
33+
from pandas._libs.sparse import SparseIndex, BlockIndex, IntIndex
3434
from pandas._libs import index as libindex
3535
import pandas.core.algorithms as algos
3636
import pandas.core.ops as ops

0 commit comments

Comments
 (0)