CLN: create pandas/types

CLN: move core/dtypes.py -> types

Author: jreback

ci/lint.sh

@@ -8,7 +8,7 @@ RET=0
 
 if [ "$LINT" ]; then
     echo "Linting"
-    for path in 'core' 'indexes' 'io' 'stats' 'compat' 'sparse' 'tools' 'tseries' 'tests' 'computation' 'util'
+    for path in 'core' 'indexes' 'types' 'io' 'stats' 'compat' 'sparse' 'tools' 'tseries' 'tests' 'computation' 'util'
     do
         echo "linting -> pandas/$path"
         flake8 pandas/$path --filename '*.py'

pandas/core/categorical.py

@@ -21,7 +21,7 @@
     _possibly_infer_to_datetimelike, get_dtype_kinds, is_list_like,
     is_sequence, is_null_slice, is_bool, _ensure_object, _ensure_int64,
     _coerce_indexer_dtype, take_1d)
-from pandas.core.dtypes import CategoricalDtype
+from pandas.types.api import CategoricalDtype
 from pandas.util.terminal import get_terminal_size
 from pandas.core.config import get_option
 

pandas/core/common.py

@@ -18,8 +18,7 @@
 from pandas import compat
 from pandas.compat import (BytesIO, range, long, u, zip, map, string_types,
                            iteritems)
-from pandas.core.dtypes import (CategoricalDtype, CategoricalDtypeType,
-                                DatetimeTZDtype, DatetimeTZDtypeType)
+from pandas.types.api import *
 from pandas.core.config import get_option
 
 
@@ -2979,29 +2978,3 @@ def _random_state(state=None):
     else:
         raise ValueError("random_state must be an integer, a numpy "
                          "RandomState, or None")
-
-
-def pandas_dtype(dtype):
-    """
-    Converts input into a pandas only dtype object or a numpy dtype object.
-
-    Parameters
-    ----------
-    dtype : object to be converted
-
-    Returns
-    -------
-    np.dtype or a pandas dtype
-    """
-    if isinstance(dtype, compat.string_types):
-        try:
-            return DatetimeTZDtype.construct_from_string(dtype)
-        except TypeError:
-            pass
-
-        try:
-            return CategoricalDtype.construct_from_string(dtype)
-        except TypeError:
-            pass
-
-    return np.dtype(dtype)

pandas/core/internals.py

@@ -20,7 +20,7 @@
                                 _maybe_convert_string_to_object,
                                 is_categorical, is_datetimelike_v_numeric,
                                 is_numeric_v_string_like, is_internal_type)
-from pandas.core.dtypes import DatetimeTZDtype
+from pandas.types.api import DatetimeTZDtype
 
 from pandas.core.index import Index, MultiIndex, _ensure_index
 from pandas.core.indexing import maybe_convert_indices, length_of_indexer

pandas/io/sql.py

@@ -19,7 +19,7 @@
 from pandas.core.api import DataFrame, Series
 from pandas.core.common import isnull
 from pandas.core.base import PandasObject
-from pandas.core.dtypes import DatetimeTZDtype
+from pandas.types.api import DatetimeTZDtype
 from pandas.tseries.tools import to_datetime
 
 from contextlib import contextmanager

pandas/tests/frame/test_constructors.py

@@ -25,7 +25,7 @@
 import pandas.core.common as com
 import pandas.lib as lib
 
-from pandas.core.dtypes import DatetimeTZDtype
+from pandas.types.api import DatetimeTZDtype
 
 from pandas.util.testing import (assert_numpy_array_equal,
                                  assert_series_equal,

pandas/tseries/tests/test_timezones.py

@@ -17,7 +17,7 @@
 from pytz import NonExistentTimeError
 
 import pandas.util.testing as tm
-from pandas.core.dtypes import DatetimeTZDtype
+from pandas.types.api import DatetimeTZDtype
 from pandas.util.testing import assert_frame_equal
 from pandas.compat import lrange, zip
 

pandas/types/__init__.py

@@ -0,0 +1,2 @@
+from pandas.types.dtypes import (CategoricalDtype, CategoricalDtypeType,
+                                 DatetimeTZDtype, DatetimeTZDtypeType) # noqa