Skip to content

Commit 387a9e6

Browse files
committed
rename types -> typed to avoid conflict with std library
1 parent 8044942 commit 387a9e6

File tree

128 files changed

+227
-227
lines changed

Some content is hidden

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

128 files changed

+227
-227
lines changed

asv_bench/benchmarks/categoricals.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-
from pandas.core.types.concat import union_categoricals
3+
from pandas.core.typed.concat import union_categoricals
44
except ImportError:
55
pass
66

pandas/api/types/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
""" public toolkit API """
22

3-
from pandas.core.types.api import * # noqa
3+
from pandas.core.typed.api import * # noqa
44
del np # noqa

pandas/compat/numpy/function.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from pandas.util.validators import (validate_args, validate_kwargs,
2323
validate_args_and_kwargs)
2424
from pandas.errors import UnsupportedFunctionCall
25-
from pandas.core.types.common import is_integer, is_bool
25+
from pandas.core.typed.common import is_integer, is_bool
2626
from pandas.compat import OrderedDict
2727

2828

pandas/computation/ops.py

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

88
import numpy as np
99

10-
from pandas.core.types.common import is_list_like, is_scalar
10+
from pandas.core.typed.common import is_list_like, is_scalar
1111
import pandas as pd
1212
from pandas.compat import PY3, string_types, text_type
1313
import pandas.core.common as com

pandas/computation/pytables.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
import pandas as pd
77

8-
from pandas.core.types.common import is_list_like
8+
from pandas.core.typed.common import is_list_like
99
import pandas.core.common as com
1010
from pandas.compat import u, string_types, DeepChainMap
1111
from pandas.core.base import StringMixin

pandas/core/algorithms.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import numpy as np
88

99
from pandas import compat, _np_version_under1p8
10-
from pandas.core.types.cast import maybe_promote
11-
from pandas.core.types.generic import (
10+
from pandas.core.typed.cast import maybe_promote
11+
from pandas.core.typed.generic import (
1212
ABCSeries, ABCIndex,
1313
ABCIndexClass, ABCCategorical)
14-
from pandas.core.types.common import (
14+
from pandas.core.typed.common import (
1515
is_unsigned_integer_dtype, is_signed_integer_dtype,
1616
is_integer_dtype, is_complex_dtype,
1717
is_categorical_dtype, is_sparse,
@@ -26,7 +26,7 @@
2626
_ensure_float64, _ensure_uint64,
2727
_ensure_int64)
2828
from pandas.compat.numpy import _np_version_under1p10
29-
from pandas.core.types.missing import isnull
29+
from pandas.core.typed.missing import isnull
3030

3131
import pandas.core.common as com
3232
from pandas.compat import string_types

pandas/core/api.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

77
from pandas.core.algorithms import factorize, unique, value_counts
8-
from pandas.core.types.missing import isnull, notnull
8+
from pandas.core.typed.missing import isnull, notnull
99
from pandas.core.categorical import Categorical
1010
from pandas.core.groupby import Grouper
1111
from pandas.formats.format import set_eng_float_format

pandas/core/base.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from pandas.compat import builtins
77
import numpy as np
88

9-
from pandas.core.types.missing import isnull
10-
from pandas.core.types.generic import ABCDataFrame, ABCSeries, ABCIndexClass
11-
from pandas.core.types.common import is_object_dtype, is_list_like, is_scalar
9+
from pandas.core.typed.missing import isnull
10+
from pandas.core.typed.generic import ABCDataFrame, ABCSeries, ABCIndexClass
11+
from pandas.core.typed.common import is_object_dtype, is_list_like, is_scalar
1212
from pandas.util.validators import validate_bool_kwarg
1313

1414
from pandas.core import common as com
@@ -725,7 +725,7 @@ def _aggregate_multiple_funcs(self, arg, _level, _axis):
725725
# we are concatting non-NDFrame objects,
726726
# e.g. a list of scalars
727727

728-
from pandas.core.types.cast import is_nested_object
728+
from pandas.core.typed.cast import is_nested_object
729729
from pandas import Series
730730
result = Series(results, index=keys, name=self.name)
731731
if is_nested_object(result):

pandas/core/categorical.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
from pandas.compat import u, lzip
99
from pandas._libs import lib, algos as libalgos
1010

11-
from pandas.core.types.generic import (
11+
from pandas.core.typed.generic import (
1212
ABCSeries, ABCIndexClass, ABCCategoricalIndex)
13-
from pandas.core.types.missing import isnull, notnull
14-
from pandas.core.types.cast import (
13+
from pandas.core.typed.missing import isnull, notnull
14+
from pandas.core.typed.cast import (
1515
maybe_infer_to_datetimelike,
1616
coerce_indexer_dtype)
17-
from pandas.core.types.dtypes import CategoricalDtype
18-
from pandas.core.types.common import (
17+
from pandas.core.typed.dtypes import CategoricalDtype
18+
from pandas.core.typed.common import (
1919
_ensure_int64,
2020
_ensure_object,
2121
_ensure_platform_int,
@@ -1218,7 +1218,7 @@ def value_counts(self, dropna=True):
12181218
12191219
"""
12201220
from numpy import bincount
1221-
from pandas.core.types.missing import isnull
1221+
from pandas.core.typed.missing import isnull
12221222
from pandas.core.series import Series
12231223
from pandas.core.index import CategoricalIndex
12241224

pandas/core/common.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313
from pandas import compat
1414
from pandas.compat import long, zip, iteritems
1515
from pandas.core.config import get_option
16-
from pandas.core.types.generic import ABCSeries
17-
from pandas.core.types.common import _NS_DTYPE
18-
from pandas.core.types.inference import _iterable_not_string
19-
from pandas.core.types.missing import isnull
16+
from pandas.core.typed.generic import ABCSeries
17+
from pandas.core.typed.common import _NS_DTYPE
18+
from pandas.core.typed.inference import _iterable_not_string
19+
from pandas.core.typed.missing import isnull
2020
from pandas.api import types
21-
from pandas.core.types import common
21+
from pandas.core.typed import common
2222

2323
# compat
2424
from pandas.errors import ( # noqa
@@ -60,7 +60,7 @@ def wrapper(*args, **kwargs):
6060
warnings.warn("pandas.core.common.{t} is deprecated. "
6161
"These are not longer public API functions, "
6262
"but can be imported from "
63-
"pandas.core.types.common.{t} instead".format(t=t),
63+
"pandas.core.typed.common.{t} instead".format(t=t),
6464
DeprecationWarning, stacklevel=3)
6565
return getattr(common, t)(*args, **kwargs)
6666
return wrapper
@@ -73,7 +73,7 @@ def wrapper(*args, **kwargs):
7373
def array_equivalent(*args, **kwargs):
7474
warnings.warn("'pandas.core.common.array_equivalent' is deprecated and "
7575
"is no longer public API", DeprecationWarning, stacklevel=2)
76-
from pandas.core.types import missing
76+
from pandas.core.typed import missing
7777
return missing.array_equivalent(*args, **kwargs)
7878

7979

0 commit comments

Comments
 (0)