Skip to content

Commit 60c0b75

Browse files
committed
rename libs -> _libs
1 parent 00a7751 commit 60c0b75

File tree

193 files changed

+275
-273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

193 files changed

+275
-273
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tseries: pandas/libs/lib.pyx pandas/libs/tslib.pyx pandas/libs/hashtable.pyx
1+
tseries: pandas/_libs/lib.pyx pandas/_libs/tslib.pyx pandas/_libs/hashtable.pyx
22
python setup.py build_ext --inplace
33

44
.PHONY : develop build clean clean_pyc tseries doc

asv_bench/benchmarks/pandas_vb_common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
np.random.seed(1234)
1919

2020
# try em until it works!
21-
for imp in ['pandas_tseries', 'pandas.lib', 'pandas.libs.lib']:
21+
for imp in ['pandas_tseries', 'pandas.lib', 'pandas._libs.lib']:
2222
try:
2323
lib = import_module(imp)
2424
break

doc/source/whatsnew/v0.20.0.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,21 +460,21 @@ If indicated, a deprecation warning will be issued if you reference that module.
460460
:header: "Previous Location", "New Location", "Deprecated"
461461
:widths: 30, 30, 4
462462

463+
"pandas.lib", "pandas._libs.lib", "X"
464+
"pandas.tslib", "pandas._libs.tslib", "X"
465+
"pandas._join", "pandas._libs.join", ""
466+
"pandas._period", "pandas._libs.period", ""
467+
"pandas.msgpack", "pandas.io.msgpack", ""
468+
"pandas.index", "pandas._libs.index", ""
469+
"pandas.algos", "pandas._libs.algos", ""
470+
"pandas.hashtable", "pandas._libs.hashtable", ""
463471
"pandas.json", "pandas.io.json.libjson", "X"
464472
"pandas.parser", "pandas.io.libparsers", "X"
465-
"pandas.lib", "pandas.libs.lib", "X"
466-
"pandas.tslib", "pandas.libs.tslib", "X"
467473
"pandas.io.sas.saslib", "pandas.io.sas.libsas", ""
468-
"pandas.msgpack", "pandas.io.msgpack", ""
469-
"pandas.index", "pandas.libs.index", ""
470-
"pandas.algos", "pandas.libs.algos", ""
471-
"pandas.hashtable", "pandas.libs.hashtable", ""
472474
"pandas._testing", "pandas.util.libtesting", ""
473475
"pandas._sparse", "pandas.sparse.libsparse", ""
474476
"pandas._hash", "pandas.tools.libhash", ""
475477
"pandas._window", "pandas.core.libwindow", ""
476-
"pandas._join", "pandas.libs.join", ""
477-
"pandas._period", "pandas.libs.period", ""
478478

479479

480480
.. _whatsnew_0200.api_breaking.groupby_describe:

pandas/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from pandas.compat.numpy import *
2424

2525
try:
26-
from pandas.libs import (hashtable as _hashtable,
26+
from pandas._libs import (hashtable as _hashtable,
2727
lib as _lib,
2828
tslib as _tslib)
2929
except ImportError as e: # pragma: no cover
@@ -62,8 +62,8 @@
6262

6363
json = _DeprecatedModule(deprmod='pandas.json', deprmodto='pandas.io.json.libjson')
6464
parser = _DeprecatedModule(deprmod='pandas.parser', deprmodto='pandas.io.libparsers')
65-
lib = _DeprecatedModule(deprmod='pandas.lib', deprmodto='pandas.libs.lib')
66-
tslib = _DeprecatedModule(deprmod='pandas.tslib', deprmodto='pandas.libs.tslib')
65+
lib = _DeprecatedModule(deprmod='pandas.lib', deprmodto='pandas._libs.lib')
66+
tslib = _DeprecatedModule(deprmod='pandas.tslib', deprmodto='pandas._libs.tslib')
6767

6868
# use the closest tagged version if possible
6969
from ._version import get_versions
File renamed without changes.

pandas/libs/algos.pyx renamed to pandas/_libs/algos.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ from util cimport numeric, get_nat
4646

4747
cimport lib
4848
from lib cimport is_null_datetimelike
49-
from pandas.libs import lib
49+
from pandas._libs import lib
5050

5151
cdef int64_t iNaT = get_nat()
5252

pandas/libs/algos_common_helper.pxi.in renamed to pandas/_libs/algos_common_helper.pxi.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@ def arrmap_{{name}}(ndarray[{{c_type}}] index, object func):
433433

434434
cdef ndarray[object] result = np.empty(length, dtype=np.object_)
435435

436-
from pandas.libs.lib import maybe_convert_objects
436+
from pandas._libs.lib import maybe_convert_objects
437437

438438
for i in range(length):
439439
result[i] = func(index[i])
File renamed without changes.

pandas/libs/hashtable.pyx renamed to pandas/_libs/hashtable.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cdef extern from "numpy/npy_math.h":
2222
cimport cython
2323
cimport numpy as cnp
2424

25-
from pandas.libs.lib import checknull
25+
from pandas._libs.lib import checknull
2626

2727
cnp.import_array()
2828
cnp.import_ufunc()

pandas/libs/index.pyx renamed to pandas/_libs/index.pyx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import numpy as np
1717

1818
cimport tslib
1919
from hashtable cimport *
20-
from pandas.libs import tslib, algos, hashtable as _hash
21-
from pandas.libs.tslib import Timestamp, Timedelta
20+
from pandas._libs import tslib, algos, hashtable as _hash
21+
from pandas._libs.tslib import Timestamp, Timedelta
2222

2323
from datetime cimport (get_datetime64_value, _pydatetime_to_dts,
2424
pandas_datetimestruct)

pandas/libs/join.pyx renamed to pandas/_libs/join.pyx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ float64 = np.dtype(np.float64)
3232
cdef double NaN = <double> np.NaN
3333
cdef double nan = NaN
3434

35-
from pandas.libs.algos import groupsort_indexer, ensure_platform_int
35+
from pandas._libs.algos import groupsort_indexer, ensure_platform_int
3636
from pandas.core.algorithms import take_nd
3737

3838
include "join_func_helper.pxi"
File renamed without changes.
File renamed without changes.
File renamed without changes.

pandas/libs/period.pyx renamed to pandas/_libs/period.pyx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ cimport cython
2222
from datetime cimport *
2323
cimport util, lib
2424
from lib cimport is_null_datetimelike, is_period
25-
from pandas.libs import tslib, lib
26-
from pandas.libs.tslib import (Timedelta, Timestamp, iNaT,
27-
NaT, have_pytz, _get_utcoffset)
25+
from pandas._libs import tslib, lib
26+
from pandas._libs.tslib import (Timedelta, Timestamp, iNaT,
27+
NaT, have_pytz, _get_utcoffset)
2828
from tslib cimport (
2929
maybe_get_tz,
3030
_is_utc,
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

pandas/libs/src/ujson/python/objToJSON.c renamed to pandas/_libs/src/ujson/python/objToJSON.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void initObjToJSON(void)
180180
Py_DECREF(mod_pandas);
181181
}
182182

183-
mod_tslib = PyImport_ImportModule("pandas.libs.tslib");
183+
mod_tslib = PyImport_ImportModule("pandas._libs.tslib");
184184
if (mod_tslib) {
185185
cls_nat = (PyTypeObject *)PyObject_GetAttrString(mod_tslib, "NaTType");
186186
Py_DECREF(mod_tslib);
File renamed without changes.
File renamed without changes.
File renamed without changes.

pandas/compat/pickle_compat.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ def load_reduce(self):
6565

6666
# 12588, extensions moving
6767
('pandas._sparse', 'BlockIndex'): ('pandas.sparse.libsparse', 'BlockIndex'),
68-
('pandas.tslib', 'Timestamp'): ('pandas.libs.tslib', 'Timestamp'),
69-
('pandas.tslib', '__nat_unpickle'): ('pandas.libs.tslib', '__nat_unpickle'),
70-
('pandas._period', 'Period'): ('pandas.libs.period', 'Period')
68+
('pandas.tslib', 'Timestamp'): ('pandas._libs.tslib', 'Timestamp'),
69+
('pandas.tslib', '__nat_unpickle'): ('pandas._libs.tslib', '__nat_unpickle'),
70+
('pandas._period', 'Period'): ('pandas._libs.period', 'Period')
7171
}
7272

7373

pandas/computation/scope.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
"""Module for scope operations
1+
"""
2+
Module for scope operations
23
"""
34

45
import sys
@@ -10,7 +11,8 @@
1011

1112
import numpy as np
1213

13-
import pandas as pd
14+
import pandas
15+
import pandas as pd # noqa
1416
from pandas.compat import DeepChainMap, map, StringIO
1517
from pandas.core.base import StringMixin
1618
import pandas.computation as compu
@@ -46,7 +48,7 @@ def _raw_hex_id(obj):
4648

4749

4850
_DEFAULT_GLOBALS = {
49-
'Timestamp': pd.libs.lib.Timestamp,
51+
'Timestamp': pandas._libs.lib.Timestamp,
5052
'datetime': datetime.datetime,
5153
'True': True,
5254
'False': False,

pandas/core/algorithms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
import pandas.core.common as com
3737
from pandas.compat import string_types
38-
from pandas.libs import algos, lib, hashtable as htable
39-
from pandas.libs.tslib import iNaT
38+
from pandas._libs import algos, lib, hashtable as htable
39+
from pandas._libs.tslib import iNaT
4040

4141

4242
# --------------- #

pandas/core/base.py

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

1313
from pandas.core import common as com
1414
import pandas.core.nanops as nanops
15-
import pandas.libs.lib as lib
15+
import pandas._libs.lib as lib
1616
from pandas.compat.numpy import function as nv
1717
from pandas.util.decorators import (Appender, cache_readonly,
1818
deprecate_kwarg, Substitution)

pandas/core/categorical.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from pandas import compat
88
from pandas.compat import u, lzip
9-
from pandas.libs import lib, algos as libalgos
9+
from pandas._libs import lib, algos as libalgos
1010

1111
from pandas.types.generic import ABCSeries, ABCIndexClass, ABCCategoricalIndex
1212
from pandas.types.missing import isnull, notnull
@@ -1897,7 +1897,7 @@ def mode(self):
18971897
modes : `Categorical` (sorted)
18981898
"""
18991899

1900-
import pandas.libs.hashtable as htable
1900+
import pandas._libs.hashtable as htable
19011901
good = self._codes != -1
19021902
values = sorted(htable.mode_int64(_ensure_int64(self._codes[good])))
19031903
result = self._constructor(values=values, categories=self.categories,

pandas/core/common.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from functools import partial
99

1010
import numpy as np
11-
from pandas.libs import lib, tslib
11+
from pandas._libs import lib, tslib
1212

1313
from pandas import compat
1414
from pandas.compat import long, zip, iteritems

pandas/core/frame.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
from pandas.formats.printing import pprint_thing
9494
import pandas.tools.plotting as gfx
9595

96-
from pandas.libs import lib, algos as libalgos
96+
from pandas._libs import lib, algos as libalgos
9797

9898
from pandas.core.config import get_option
9999

@@ -3191,7 +3191,7 @@ def duplicated(self, subset=None, keep='first'):
31913191
duplicated : Series
31923192
"""
31933193
from pandas.core.sorting import get_group_index
3194-
from pandas.libs.hashtable import duplicated_int64, _SIZE_HINT_LIMIT
3194+
from pandas._libs.hashtable import duplicated_int64, _SIZE_HINT_LIMIT
31953195

31963196
def f(vals):
31973197
labels, shape = algorithms.factorize(

pandas/core/generic.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import numpy as np
99
import pandas as pd
1010

11-
from pandas.libs import tslib, lib
11+
from pandas._libs import tslib, lib
1212
from pandas.types.common import (_coerce_to_dtype,
1313
_ensure_int64,
1414
needs_i8_conversion,

pandas/core/groupby.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
import pandas.core.common as com
6060
from pandas.core.config import option_context
6161

62-
from pandas.libs import lib, algos as libalgos, Timestamp, NaT, iNaT
63-
from pandas.libs.lib import count_level_2d
62+
from pandas._libs import lib, algos as libalgos, Timestamp, NaT, iNaT
63+
from pandas._libs.lib import count_level_2d
6464

6565
_doc_template = """
6666

pandas/core/internals.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@
5353

5454
import pandas.core.missing as missing
5555
from pandas.sparse.array import _maybe_to_sparse, SparseArray
56-
from pandas.libs import lib, tslib
57-
from pandas.libs.tslib import Timedelta
58-
from pandas.libs.lib import BlockPlacement
56+
from pandas._libs import lib, tslib
57+
from pandas._libs.tslib import Timedelta
58+
from pandas._libs.lib import BlockPlacement
5959

6060
import pandas.computation.expressions as expressions
6161
from pandas.util.decorators import cache_readonly

pandas/core/missing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import numpy as np
66
from distutils.version import LooseVersion
77

8-
from pandas.libs import algos, lib
8+
from pandas._libs import algos, lib
99

1010
from pandas.compat import range, string_types
1111
from pandas.types.common import (is_numeric_v_string_like,

pandas/core/nanops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
_USE_BOTTLENECK = False
1111

1212
from pandas import compat
13-
from pandas.libs import tslib, algos, lib
13+
from pandas._libs import tslib, algos, lib
1414
from pandas.types.common import (_get_dtype,
1515
is_float, is_scalar,
1616
is_integer, is_complex, is_float_dtype,

pandas/core/ops.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import pandas as pd
1212
import datetime
1313

14-
from pandas.libs import (lib, index as libindex,
15-
tslib as libts, algos as libalgos, iNaT)
14+
from pandas._libs import (lib, index as libindex,
15+
tslib as libts, algos as libalgos, iNaT)
1616

1717
from pandas import compat
1818
from pandas.util.decorators import Appender

pandas/core/reshape.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
decons_obs_group_ids)
2525

2626
import pandas.core.algorithms as algos
27-
import pandas.libs.algos as _algos
27+
import pandas._libs.algos as _algos
2828

2929
from pandas.core.index import MultiIndex, _get_na_value
3030

pandas/core/series.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
from pandas.util.decorators import Appender, deprecate_kwarg, Substitution
6969
from pandas.util.validators import validate_bool_kwarg
7070

71-
from pandas.libs import index as libindex, tslib as libts, lib, iNaT
71+
from pandas._libs import index as libindex, tslib as libts, lib, iNaT
7272
from pandas.core.config import get_option
7373

7474
__all__ = ['Series']

pandas/core/sorting.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
is_categorical_dtype)
99
from pandas.types.missing import isnull
1010
import pandas.core.algorithms as algorithms
11-
from pandas.libs import lib, algos, hashtable
12-
from pandas.libs.hashtable import unique_label_indices
11+
from pandas._libs import lib, algos, hashtable
12+
from pandas._libs.hashtable import unique_label_indices
1313

1414

1515
_INT64_MAX = np.iinfo(np.int64).max

pandas/core/strings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
from pandas.core.base import AccessorProperty, NoNewAttributesMixin
1818
from pandas.util.decorators import Appender
1919
import re
20-
import pandas.libs.lib as lib
20+
import pandas._libs.lib as lib
2121
import warnings
2222
import textwrap
2323
import codecs

pandas/formats/format.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
from pandas.io.common import _get_handle, UnicodeWriter, _expand_user
3434
from pandas.formats.printing import adjoin, justify, pprint_thing
3535
import pandas.core.common as com
36-
import pandas.libs.lib as lib
37-
from pandas.libs.tslib import (iNaT, Timestamp, Timedelta,
38-
format_array_from_datetime)
36+
import pandas._libs.lib as lib
37+
from pandas._libs.tslib import (iNaT, Timestamp, Timedelta,
38+
format_array_from_datetime)
3939
from pandas.tseries.index import DatetimeIndex
4040
from pandas.tseries.period import PeriodIndex
4141
import pandas as pd

pandas/indexes/api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from pandas.indexes.range import RangeIndex # noqa
99

1010
import pandas.core.common as com
11-
import pandas.libs.lib as lib
11+
import pandas._libs.lib as lib
1212

1313
# TODO: there are many places that rely on these private methods existing in
1414
# pandas.core.index

pandas/indexes/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import operator
44

55
import numpy as np
6-
from pandas.libs import (lib, index as libindex, tslib as libts,
7-
algos as libalgos, join as libjoin,
8-
Timestamp, Timedelta, )
9-
from pandas.libs.lib import is_datetime_array
6+
from pandas._libs import (lib, index as libindex, tslib as libts,
7+
algos as libalgos, join as libjoin,
8+
Timestamp, Timedelta, )
9+
from pandas._libs.lib import is_datetime_array
1010

1111
from pandas.compat import range, u
1212
from pandas.compat.numpy import function as nv

pandas/indexes/category.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import numpy as np
2-
from pandas.libs import index as libindex
2+
from pandas._libs import index as libindex
33

44
from pandas import compat
55
from pandas.compat.numpy import function as nv
@@ -303,7 +303,7 @@ def unique(self):
303303
False: 'first'})
304304
@Appender(base._shared_docs['duplicated'] % _index_doc_kwargs)
305305
def duplicated(self, keep='first'):
306-
from pandas.libs.hashtable import duplicated_int64
306+
from pandas._libs.hashtable import duplicated_int64
307307
codes = self.codes.astype('i8')
308308
return duplicated_int64(codes, keep)
309309

0 commit comments

Comments
 (0)