CLN: move .formats

pandas/computation/engines.py

@@ -6,7 +6,7 @@
 
 from pandas import compat
 from pandas.compat import map
-import pandas.formats.printing as printing
+import pandas.core.formats.printing as printing
 from pandas.computation.align import _align, _reconstruct_object
 from pandas.computation.ops import (UndefinedVariableError,
                                     _mathops, _reductions)

pandas/computation/eval.py

@@ -5,7 +5,7 @@
 
 import warnings
 import tokenize
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from pandas.computation import _NUMEXPR_INSTALLED
 from pandas.computation.expr import Expr, _parsers, tokenize_string
 from pandas.computation.scope import _ensure_scope

pandas/computation/expr.py

@@ -12,7 +12,7 @@
 from pandas.compat import StringIO, lmap, zip, reduce, string_types
 from pandas.core.base import StringMixin
 from pandas.core import common as com
-import pandas.formats.printing as printing
+import pandas.core.formats.printing as printing
 from pandas.tools.util import compose
 from pandas.computation.ops import (_cmp_ops_syms, _bool_ops_syms,
                                     _arith_ops_syms, _unary_ops_syms, is_term)

pandas/computation/ops.py

@@ -11,7 +11,7 @@
 import pandas as pd
 from pandas.compat import PY3, string_types, text_type
 import pandas.core.common as com
-from pandas.formats.printing import pprint_thing, pprint_thing_encoded
+from pandas.core.formats.printing import pprint_thing, pprint_thing_encoded
 from pandas.core.base import StringMixin
 from pandas.computation.common import _ensure_decoded, _result_type_many
 from pandas.computation.scope import _DEFAULT_GLOBALS

pandas/computation/pytables.py

@@ -9,7 +9,7 @@
 import pandas.core.common as com
 from pandas.compat import u, string_types, DeepChainMap
 from pandas.core.base import StringMixin
-from pandas.formats.printing import pprint_thing, pprint_thing_encoded
+from pandas.core.formats.printing import pprint_thing, pprint_thing_encoded
 from pandas.computation import expr, ops
 from pandas.computation.ops import is_term, UndefinedVariableError
 from pandas.computation.expr import BaseExprVisitor

pandas/core/api.py

@@ -8,7 +8,7 @@
 from pandas.types.missing import isnull, notnull
 from pandas.core.categorical import Categorical
 from pandas.core.groupby import Grouper
-from pandas.formats.format import set_eng_float_format
+from pandas.core.formats.format import set_eng_float_format
 from pandas.core.index import (Index, CategoricalIndex, Int64Index,
                                UInt64Index, RangeIndex, Float64Index,
                                MultiIndex, IntervalIndex)

pandas/core/categorical.py

@@ -1612,7 +1612,7 @@ def _repr_categories(self):
         """ return the base repr for the categories """
         max_categories = (10 if get_option("display.max_categories") == 0 else
                           get_option("display.max_categories"))
-        from pandas.formats import format as fmt
+        from pandas.core.formats import format as fmt
         if len(self.categories) > max_categories:
             num = max_categories // 2
             head = fmt.format_array(self.categories[:num], None)
@@ -1660,7 +1660,7 @@ def _repr_footer(self):
         return u('Length: %d\n%s') % (len(self), self._repr_categories_info())
 
     def _get_repr(self, length=True, na_rep='NaN', footer=True):
-        from pandas.formats import format as fmt
+        from pandas.core.formats import format as fmt
         formatter = fmt.CategoricalFormatter(self, length=length,
                                              na_rep=na_rep, footer=footer)
         result = formatter.to_string()

pandas/core/config.py

@@ -774,7 +774,7 @@ def is_instance_factory(_type):
     """
     if isinstance(_type, (tuple, list)):
         _type = tuple(_type)
-        from pandas.formats.printing import pprint_thing
+        from pandas.core.formats.printing import pprint_thing
         type_repr = "|".join(map(pprint_thing, _type))
     else:
         type_repr = "'%s'" % _type
@@ -792,7 +792,7 @@ def is_one_of_factory(legal_values):
     legal_values = [c for c in legal_values if not callable(c)]
 
     def inner(x):
-        from pandas.formats.printing import pprint_thing as pp
+        from pandas.core.formats.printing import pprint_thing as pp
         if x not in legal_values:
 
             if not any([c(x) for c in callables]):

pandas/core/config_init.py

@@ -15,7 +15,7 @@
 from pandas.core.config import (is_int, is_bool, is_text, is_instance_factory,
                                 is_one_of_factory, get_default_val,
                                 is_callable)
-from pandas.formats.format import detect_console_encoding
+from pandas.core.formats.format import detect_console_encoding
 
 #
 # options from the "display" namespace

pandas/formats/format.py → pandas/core/formats/format.py

@@ -32,7 +32,7 @@
 from pandas.util.terminal import get_terminal_size
 from pandas.core.config import get_option, set_option
 from pandas.io.common import _get_handle, UnicodeWriter, _expand_user
-from pandas.formats.printing import adjoin, justify, pprint_thing
+from pandas.core.formats.printing import adjoin, justify, pprint_thing
 import pandas.core.common as com
 import pandas._libs.lib as lib
 from pandas._libs.tslib import (iNaT, Timestamp, Timedelta,

pandas/core/frame.py

@@ -88,8 +88,8 @@
 import pandas.core.common as com
 import pandas.core.nanops as nanops
 import pandas.core.ops as ops
-import pandas.formats.format as fmt
-from pandas.formats.printing import pprint_thing
+import pandas.core.formats.format as fmt
+from pandas.core.formats.printing import pprint_thing
 import pandas.tools.plotting as gfx
 
 from pandas._libs import lib, algos as libalgos
@@ -634,9 +634,9 @@ def style(self):
 
         See Also
         --------
-        pandas.formats.style.Styler
+        pandas.core.formats.style.Styler
         """
-        from pandas.formats.style import Styler
+        from pandas.core.formats.style import Styler
         return Styler(self)
 
     def iteritems(self):
@@ -1722,7 +1722,7 @@ def info(self, verbose=None, buf=None, max_cols=None, memory_usage=None,
             - If False, never show counts.
 
         """
-        from pandas.formats.format import _put_lines
+        from pandas.core.formats.format import _put_lines
 
         if buf is None:  # pragma: no cover
             buf = sys.stdout

pandas/core/generic.py

@@ -42,8 +42,8 @@
 import pandas.core.algorithms as algos
 import pandas.core.common as com
 import pandas.core.missing as missing
-from pandas.formats.printing import pprint_thing
-from pandas.formats.format import format_percentiles
+from pandas.core.formats.printing import pprint_thing
+from pandas.core.formats.format import format_percentiles
 from pandas.tseries.frequencies import to_offset
 from pandas import compat
 from pandas.compat.numpy import function as nv

pandas/core/groupby.py

@@ -54,7 +54,7 @@
                                  decons_obs_group_ids, get_indexer_dict)
 from pandas.util.decorators import (cache_readonly, Substitution,
                                     Appender, make_signature)
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from pandas.util.validators import validate_kwargs
 
 import pandas.core.algorithms as algorithms

pandas/core/internals.py

@@ -51,7 +51,7 @@
 from pandas.core.indexing import maybe_convert_indices, length_of_indexer
 from pandas.core.categorical import Categorical, maybe_to_categorical
 from pandas.tseries.index import DatetimeIndex
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 
 import pandas.core.missing as missing
 from pandas.sparse.array import _maybe_to_sparse, SparseArray
@@ -1610,7 +1610,7 @@ def to_native_types(self, slicer=None, na_rep='', float_format=None,
             values[mask] = na_rep
             return values
 
-        from pandas.formats.format import FloatArrayFormatter
+        from pandas.core.formats.format import FloatArrayFormatter
         formatter = FloatArrayFormatter(values, na_rep=na_rep,
                                         float_format=float_format,
                                         decimal=decimal, quoting=quoting,
@@ -2324,7 +2324,8 @@ def to_native_types(self, slicer=None, na_rep=None, date_format=None,
         if slicer is not None:
             values = values[..., slicer]
 
-        from pandas.formats.format import _get_format_datetime64_from_values
+        from pandas.core.formats.format import (
+            _get_format_datetime64_from_values)
         format = _get_format_datetime64_from_values(values, date_format)
 
         result = tslib.format_array_from_datetime(

pandas/core/panel.py

@@ -24,7 +24,7 @@
 from pandas.core.generic import NDFrame, _shared_docs
 from pandas.core.index import (Index, MultiIndex, _ensure_index,
                                _get_combined_index)
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from pandas.core.indexing import maybe_droplevels
 from pandas.core.internals import (BlockManager,
                                    create_block_manager_from_arrays,

pandas/core/series.py

@@ -65,7 +65,7 @@
 
 import pandas.core.common as com
 import pandas.core.nanops as nanops
-import pandas.formats.format as fmt
+import pandas.core.formats.format as fmt
 from pandas.util.decorators import Appender, deprecate_kwarg, Substitution
 from pandas.util.validators import validate_bool_kwarg
 

pandas/indexes/base.py

@@ -47,7 +47,7 @@
 import pandas.types.concat as _concat
 import pandas.core.missing as missing
 import pandas.core.algorithms as algos
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from pandas.core.ops import _comp_method_OBJECT_ARRAY
 from pandas.core.strings import StringAccessorMixin
 from pandas.core.config import get_option
@@ -830,7 +830,8 @@ def _format_data(self):
         """
         Return the formatted data as a unicode string
         """
-        from pandas.formats.format import get_console_size, _get_adjustment
+        from pandas.core.formats.format import (
+            get_console_size, _get_adjustment)
         display_width, _ = get_console_size()
         if display_width is None:
             display_width = get_option('display.width') or 80
@@ -1841,7 +1842,7 @@ def format(self, name=False, formatter=None, **kwargs):
     def _format_with_header(self, header, na_rep='NaN', **kwargs):
         values = self.values
 
-        from pandas.formats.format import format_array
+        from pandas.core.formats.format import format_array
 
         if is_categorical_dtype(values.dtype):
             values = np.array(values)

pandas/indexes/frozen.py

@@ -11,7 +11,7 @@
 import numpy as np
 from pandas.core.base import PandasObject
 from pandas.types.cast import coerce_indexer_dtype
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 
 
 class FrozenList(PandasObject, list):

pandas/indexes/interval.py

@@ -920,7 +920,7 @@ def _format_with_header(self, header, **kwargs):
 
     def _format_native_types(self, na_rep='', quoting=None, **kwargs):
         """ actually format my specific types """
-        from pandas.formats.format import IntervalArrayFormatter
+        from pandas.core.formats.format import IntervalArrayFormatter
         return IntervalArrayFormatter(values=self,
                                       na_rep=na_rep,
                                       justify='all').get_result()

pandas/indexes/multi.py

@@ -30,7 +30,7 @@
 import pandas.core.common as com
 import pandas.core.missing as missing
 import pandas.core.algorithms as algos
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 
 from pandas.core.config import get_option
 
@@ -934,7 +934,7 @@ def format(self, space=2, sparsify=None, adjoin=True, names=False,
                                       sentinel=sentinel)
 
         if adjoin:
-            from pandas.formats.format import _get_adjustment
+            from pandas.core.formats.format import _get_adjustment
             adj = _get_adjustment()
             return adj.adjoin(space, *result_levels).split('\n')
         else:

pandas/indexes/numeric.py

@@ -301,7 +301,7 @@ def _convert_slice_indexer(self, key, kind=None):
 
     def _format_native_types(self, na_rep='', float_format=None, decimal='.',
                              quoting=None, **kwargs):
-        from pandas.formats.format import FloatArrayFormatter
+        from pandas.core.formats.format import FloatArrayFormatter
         formatter = FloatArrayFormatter(self.values, na_rep=na_rep,
                                         float_format=float_format,
                                         decimal=decimal, quoting=quoting,

pandas/io/common.py

@@ -8,7 +8,7 @@
 
 from pandas.compat import StringIO, BytesIO, string_types, text_type
 from pandas import compat
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from pandas.core.common import AbstractMethodError
 from pandas.types.common import is_number, is_file_like
 

pandas/io/excel.py

@@ -23,7 +23,7 @@
 from pandas.compat import (map, zip, reduce, range, lrange, u, add_metaclass,
                            string_types, OrderedDict)
 from pandas.core import config
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 import pandas.compat as compat
 import pandas.compat.openpyxl_compat as openpyxl_compat
 from warnings import warn

pandas/io/html.py

@@ -21,7 +21,7 @@
                            raise_with_traceback, binary_type)
 from pandas import Series
 from pandas.core.common import AbstractMethodError
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 
 _IMPORTS = False
 _HAS_BS4 = False

pandas/io/json/json.py

@@ -9,7 +9,7 @@
 from pandas import Series, DataFrame, to_datetime
 from pandas.io.common import get_filepath_or_buffer, _get_handle
 from pandas.core.common import AbstractMethodError
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 from .normalize import _convert_to_line_delimits
 from .table_schema import build_table_schema
 from pandas.types.common import is_period_dtype

pandas/io/pytables.py

@@ -31,7 +31,7 @@
 from pandas.io.common import _stringify_path
 from pandas.sparse.array import BlockIndex, IntIndex
 from pandas.core.base import StringMixin
-from pandas.formats.printing import adjoin, pprint_thing
+from pandas.core.formats.printing import adjoin, pprint_thing
 from pandas.errors import PerformanceWarning
 from pandas.core.common import _asarray_tuplesafe
 from pandas.core.algorithms import match, unique

pandas/sparse/array.py

@@ -31,7 +31,7 @@
 from pandas._libs import index as libindex
 import pandas.core.algorithms as algos
 import pandas.core.ops as ops
-import pandas.formats.printing as printing
+import pandas.core.formats.printing as printing
 from pandas.util.decorators import Appender
 from pandas.indexes.base import _index_shared_docs
 

pandas/sparse/list.py

@@ -1,7 +1,7 @@
 import warnings
 import numpy as np
 from pandas.core.base import PandasObject
-from pandas.formats.printing import pprint_thing
+from pandas.core.formats.printing import pprint_thing
 
 from pandas.types.common import is_scalar
 from pandas.sparse.array import SparseArray

pandas/tests/api/test_api.py

@@ -31,14 +31,17 @@ class TestPDApi(Base, tm.TestCase):
 
     # top-level sub-packages
     lib = ['api', 'compat', 'computation', 'core',
-           'indexes', 'formats', 'errors', 'pandas',
+           'indexes', 'errors', 'pandas',
            'test', 'tools', 'tseries', 'sparse',
            'types', 'util', 'options', 'io']
 
     # these are already deprecated; awaiting removal
     deprecated_modules = ['stats', 'datetools', 'parser',
                           'json', 'lib', 'tslib']
 
+    # decide if we need to deprecate these
+    to_be_deprecated_modules = ['formats']
+
     # misc
     misc = ['IndexSlice', 'NaT']
 

pandas/tests/formats/test_eng_formatting.py → pandas/tests/core/formats/test_eng_formatting.py

@@ -2,7 +2,7 @@
 import pandas as pd
 from pandas import DataFrame
 from pandas.compat import u
-import pandas.formats.format as fmt
+import pandas.core.formats.format as fmt
 from pandas.util import testing as tm
 
 

pandas/tests/formats/test_format.py → pandas/tests/core/formats/test_format.py

@@ -25,8 +25,8 @@
                            is_platform_32bit)
 import pandas.compat as compat
 
-import pandas.formats.format as fmt
-import pandas.formats.printing as printing
+import pandas.core.formats.format as fmt
+import pandas.core.formats.printing as printing
 
 import pandas.util.testing as tm
 from pandas.util.terminal import get_terminal_size
@@ -889,7 +889,7 @@ def test_frame_info_encoding(self):
         fmt.set_option('display.max_rows', 200)
 
     def test_pprint_thing(self):
-        from pandas.formats.printing import pprint_thing as pp_t
+        from pandas.core.formats.printing import pprint_thing as pp_t
 
         if PY3:
             pytest.skip("doesn't work on Python 3")