diff --git a/pandas/computation/engines.py b/pandas/computation/engines.py index aebc5bb02d59d..718cf5a2e4ccf 100644 --- a/pandas/computation/engines.py +++ b/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) diff --git a/pandas/computation/eval.py b/pandas/computation/eval.py index 5b21c753a71da..5a6b87f1c8f98 100644 --- a/pandas/computation/eval.py +++ b/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 diff --git a/pandas/computation/expr.py b/pandas/computation/expr.py index e78806b38c667..6db178d801872 100644 --- a/pandas/computation/expr.py +++ b/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) diff --git a/pandas/computation/ops.py b/pandas/computation/ops.py index 6ba2a21940d55..d64cebf2ea380 100644 --- a/pandas/computation/ops.py +++ b/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 diff --git a/pandas/computation/pytables.py b/pandas/computation/pytables.py index 2a5056963fe8d..5c3ff7f8cab8d 100644 --- a/pandas/computation/pytables.py +++ b/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 diff --git a/pandas/core/api.py b/pandas/core/api.py index ea5be17ef3aaf..25f8c5c4de606 100644 --- a/pandas/core/api.py +++ b/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) diff --git a/pandas/core/categorical.py b/pandas/core/categorical.py index 906e8efafe4af..abd9090458ce2 100644 --- a/pandas/core/categorical.py +++ b/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() diff --git a/pandas/core/config.py b/pandas/core/config.py index 39ed2f9545266..e37358839e4d8 100644 --- a/pandas/core/config.py +++ b/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]): diff --git a/pandas/core/config_init.py b/pandas/core/config_init.py index 931fe0661818d..599ce5cce9816 100644 --- a/pandas/core/config_init.py +++ b/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 diff --git a/pandas/formats/__init__.py b/pandas/core/formats/__init__.py similarity index 100% rename from pandas/formats/__init__.py rename to pandas/core/formats/__init__.py diff --git a/pandas/formats/format.py b/pandas/core/formats/format.py similarity index 99% rename from pandas/formats/format.py rename to pandas/core/formats/format.py index 907198d98cf5b..5d20da4ce281b 100644 --- a/pandas/formats/format.py +++ b/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, diff --git a/pandas/formats/printing.py b/pandas/core/formats/printing.py similarity index 100% rename from pandas/formats/printing.py rename to pandas/core/formats/printing.py diff --git a/pandas/formats/style.py b/pandas/core/formats/style.py similarity index 100% rename from pandas/formats/style.py rename to pandas/core/formats/style.py diff --git a/pandas/core/frame.py b/pandas/core/frame.py index 4565250c78387..cc1c4575ee4ca 100644 --- a/pandas/core/frame.py +++ b/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 diff --git a/pandas/core/generic.py b/pandas/core/generic.py index 316c9f5e2ccd8..61f6cca387a70 100644 --- a/pandas/core/generic.py +++ b/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 diff --git a/pandas/core/groupby.py b/pandas/core/groupby.py index 45a9577c8d8b2..f409e83ec1c43 100644 --- a/pandas/core/groupby.py +++ b/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 diff --git a/pandas/core/internals.py b/pandas/core/internals.py index 57361886eab8c..f502dfe4579ca 100644 --- a/pandas/core/internals.py +++ b/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( diff --git a/pandas/core/panel.py b/pandas/core/panel.py index 24f4d219fb9ca..c8c038157b5a2 100644 --- a/pandas/core/panel.py +++ b/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, diff --git a/pandas/core/series.py b/pandas/core/series.py index 3305f0b6c439e..841056cb28b67 100644 --- a/pandas/core/series.py +++ b/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 diff --git a/pandas/indexes/base.py b/pandas/indexes/base.py index 00ad4ca71cb9d..7a8b65fde2c54 100644 --- a/pandas/indexes/base.py +++ b/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) diff --git a/pandas/indexes/frozen.py b/pandas/indexes/frozen.py index ab1228c008ca8..7277e4b4a70ff 100644 --- a/pandas/indexes/frozen.py +++ b/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): diff --git a/pandas/indexes/interval.py b/pandas/indexes/interval.py index 63315ef861d12..1479f914e8e22 100644 --- a/pandas/indexes/interval.py +++ b/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() diff --git a/pandas/indexes/multi.py b/pandas/indexes/multi.py index d1c8e0ba1cc4e..6b41778ca28ea 100644 --- a/pandas/indexes/multi.py +++ b/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: diff --git a/pandas/indexes/numeric.py b/pandas/indexes/numeric.py index 31258c785d9e8..32d174c350310 100644 --- a/pandas/indexes/numeric.py +++ b/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, diff --git a/pandas/io/common.py b/pandas/io/common.py index 8ee6ded67f790..8104c9937f9ec 100644 --- a/pandas/io/common.py +++ b/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 diff --git a/pandas/io/excel.py b/pandas/io/excel.py index 7f2f0cf4943b8..8c1fa7c19f729 100644 --- a/pandas/io/excel.py +++ b/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 diff --git a/pandas/io/html.py b/pandas/io/html.py index 7b58e612de2df..561065d89e2cf 100644 --- a/pandas/io/html.py +++ b/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 diff --git a/pandas/io/json/json.py b/pandas/io/json/json.py index 114ec4bb2723e..e1860d40061bf 100644 --- a/pandas/io/json/json.py +++ b/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 diff --git a/pandas/io/pytables.py b/pandas/io/pytables.py index 802f460ecba07..50e26e577ded1 100644 --- a/pandas/io/pytables.py +++ b/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 diff --git a/pandas/sparse/array.py b/pandas/sparse/array.py index f149e724c19c3..e129077e218cb 100644 --- a/pandas/sparse/array.py +++ b/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 diff --git a/pandas/sparse/list.py b/pandas/sparse/list.py index 54ebf5e51045d..d340c8e88171a 100644 --- a/pandas/sparse/list.py +++ b/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 diff --git a/pandas/tests/api/test_api.py b/pandas/tests/api/test_api.py index a15d7cf26cbea..98eda1365a09e 100644 --- a/pandas/tests/api/test_api.py +++ b/pandas/tests/api/test_api.py @@ -31,7 +31,7 @@ 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'] @@ -39,6 +39,9 @@ class TestPDApi(Base, tm.TestCase): deprecated_modules = ['stats', 'datetools', 'parser', 'json', 'lib', 'tslib'] + # decide if we need to deprecate these + to_be_deprecated_modules = ['formats'] + # misc misc = ['IndexSlice', 'NaT'] diff --git a/pandas/tests/formats/__init__.py b/pandas/tests/core/__init__.py similarity index 100% rename from pandas/tests/formats/__init__.py rename to pandas/tests/core/__init__.py diff --git a/pandas/tests/core/formats/__init__.py b/pandas/tests/core/formats/__init__.py new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/pandas/tests/formats/data/unicode_series.csv b/pandas/tests/core/formats/data/unicode_series.csv similarity index 100% rename from pandas/tests/formats/data/unicode_series.csv rename to pandas/tests/core/formats/data/unicode_series.csv diff --git a/pandas/tests/formats/test_eng_formatting.py b/pandas/tests/core/formats/test_eng_formatting.py similarity index 99% rename from pandas/tests/formats/test_eng_formatting.py rename to pandas/tests/core/formats/test_eng_formatting.py index d2badd4fc160a..94c0f2b1445f4 100644 --- a/pandas/tests/formats/test_eng_formatting.py +++ b/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 diff --git a/pandas/tests/formats/test_format.py b/pandas/tests/core/formats/test_format.py similarity index 99% rename from pandas/tests/formats/test_format.py rename to pandas/tests/core/formats/test_format.py index 83458c82a3d7c..1d06c356f272d 100644 --- a/pandas/tests/formats/test_format.py +++ b/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") diff --git a/pandas/tests/formats/test_printing.py b/pandas/tests/core/formats/test_printing.py similarity index 98% rename from pandas/tests/formats/test_printing.py rename to pandas/tests/core/formats/test_printing.py index cacba2ad3f3ba..1c1b7bf4a1efe 100644 --- a/pandas/tests/formats/test_printing.py +++ b/pandas/tests/core/formats/test_printing.py @@ -2,8 +2,8 @@ import pytest from pandas import compat import pandas as pd -import pandas.formats.printing as printing -import pandas.formats.format as fmt +import pandas.core.formats.printing as printing +import pandas.core.formats.format as fmt import pandas.util.testing as tm import pandas.core.config as cf diff --git a/pandas/tests/formats/test_style.py b/pandas/tests/core/formats/test_style.py similarity index 99% rename from pandas/tests/formats/test_style.py rename to pandas/tests/core/formats/test_style.py index 44af0b8ebb085..879b2e800d985 100644 --- a/pandas/tests/formats/test_style.py +++ b/pandas/tests/core/formats/test_style.py @@ -8,7 +8,7 @@ import pandas.util.testing as tm jinja2 = pytest.importorskip('jinja2') -from pandas.formats.style import Styler, _get_level_lengths # noqa +from pandas.core.formats.style import Styler, _get_level_lengths # noqa class TestStyler(TestCase): diff --git a/pandas/tests/formats/test_to_csv.py b/pandas/tests/core/formats/test_to_csv.py similarity index 100% rename from pandas/tests/formats/test_to_csv.py rename to pandas/tests/core/formats/test_to_csv.py diff --git a/pandas/tests/formats/test_to_html.py b/pandas/tests/core/formats/test_to_html.py similarity index 99% rename from pandas/tests/formats/test_to_html.py rename to pandas/tests/core/formats/test_to_html.py index 771c66e84037c..662d835fdd2b1 100644 --- a/pandas/tests/formats/test_to_html.py +++ b/pandas/tests/core/formats/test_to_html.py @@ -11,7 +11,7 @@ from pandas import compat, DataFrame, MultiIndex, option_context, Index from pandas.compat import u, lrange, StringIO from pandas.util import testing as tm -import pandas.formats.format as fmt +import pandas.core.formats.format as fmt div_style = '' try: diff --git a/pandas/tests/formats/test_to_latex.py b/pandas/tests/core/formats/test_to_latex.py similarity index 100% rename from pandas/tests/formats/test_to_latex.py rename to pandas/tests/core/formats/test_to_latex.py diff --git a/pandas/tests/frame/test_analytics.py b/pandas/tests/frame/test_analytics.py index dda52bbc536c9..2471c72057333 100644 --- a/pandas/tests/frame/test_analytics.py +++ b/pandas/tests/frame/test_analytics.py @@ -18,7 +18,7 @@ import pandas as pd import pandas.core.nanops as nanops import pandas.core.algorithms as algorithms -import pandas.formats.printing as printing +import pandas.core.formats.printing as printing import pandas.util.testing as tm from pandas.tests.frame.common import TestData diff --git a/pandas/tests/frame/test_operators.py b/pandas/tests/frame/test_operators.py index 268854fe6b62d..aa50064a88f40 100644 --- a/pandas/tests/frame/test_operators.py +++ b/pandas/tests/frame/test_operators.py @@ -15,7 +15,7 @@ from pandas import (DataFrame, Series, MultiIndex, Timestamp, date_range) import pandas.core.common as com -import pandas.formats.printing as printing +import pandas.core.formats.printing as printing import pandas as pd from pandas.util.testing import (assert_numpy_array_equal, diff --git a/pandas/tests/frame/test_repr_info.py b/pandas/tests/frame/test_repr_info.py index 918938c1758ed..ca42a125eca74 100644 --- a/pandas/tests/frame/test_repr_info.py +++ b/pandas/tests/frame/test_repr_info.py @@ -11,7 +11,7 @@ from pandas import (DataFrame, compat, option_context) from pandas.compat import StringIO, lrange, u -import pandas.formats.format as fmt +import pandas.core.formats.format as fmt import pandas as pd import pandas.util.testing as tm diff --git a/pandas/tests/groupby/test_aggregate.py b/pandas/tests/groupby/test_aggregate.py index 2abae97b3151b..07ae0ca70667d 100644 --- a/pandas/tests/groupby/test_aggregate.py +++ b/pandas/tests/groupby/test_aggregate.py @@ -18,7 +18,7 @@ from pandas.util.testing import assert_frame_equal, assert_series_equal from pandas.core.groupby import SpecificationError, DataError from pandas.compat import OrderedDict -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing import pandas.util.testing as tm diff --git a/pandas/tests/indexing/common.py b/pandas/tests/indexing/common.py index 0f8a9573a233b..16e95d5c0f57d 100644 --- a/pandas/tests/indexing/common.py +++ b/pandas/tests/indexing/common.py @@ -8,7 +8,7 @@ from pandas.types.common import is_scalar from pandas import Series, DataFrame, Panel, date_range, UInt64Index from pandas.util import testing as tm -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing _verbose = False diff --git a/pandas/tests/io/test_excel.py b/pandas/tests/io/test_excel.py index d83e26995020c..cb9482bbf389f 100644 --- a/pandas/tests/io/test_excel.py +++ b/pandas/tests/io/test_excel.py @@ -2006,7 +2006,7 @@ def test_to_excel_styleconverter(self): self.assertEqual(kw['protection'], protection) def test_write_cells_merge_styled(self): - from pandas.formats.format import ExcelCell + from pandas.core.formats.format import ExcelCell from openpyxl import styles sheet_name = 'merge_styled' @@ -2119,7 +2119,7 @@ def test_write_cells_merge_styled(self): if not openpyxl_compat.is_compat(major_ver=2): pytest.skip('incompatible openpyxl version') - from pandas.formats.format import ExcelCell + from pandas.core.formats.format import ExcelCell sheet_name = 'merge_styled' diff --git a/pandas/tests/io/test_pytables.py b/pandas/tests/io/test_pytables.py index 9908a320a6646..616dee18d5af8 100644 --- a/pandas/tests/io/test_pytables.py +++ b/pandas/tests/io/test_pytables.py @@ -17,7 +17,7 @@ isnull) from pandas.compat import is_platform_windows, PY3, PY35 -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing tables = pytest.importorskip('tables') from pandas.io.pytables import TableIterator diff --git a/pandas/tests/plotting/test_frame.py b/pandas/tests/plotting/test_frame.py index 8090b9cc44ca3..fc892da8902ed 100644 --- a/pandas/tests/plotting/test_frame.py +++ b/pandas/tests/plotting/test_frame.py @@ -13,7 +13,7 @@ bdate_range) from pandas.types.api import is_list_like from pandas.compat import range, lrange, lmap, lzip, u, zip, PY3 -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing import pandas.util.testing as tm from pandas.util.testing import slow diff --git a/pandas/tests/series/test_api.py b/pandas/tests/series/test_api.py index 2facbaf1fe31e..dd1bfa396c55d 100644 --- a/pandas/tests/series/test_api.py +++ b/pandas/tests/series/test_api.py @@ -9,7 +9,7 @@ from pandas.compat import range from pandas import compat -import pandas.formats.printing as printing +import pandas.core.formats.printing as printing from pandas.util.testing import (assert_series_equal, ensure_clean) import pandas.util.testing as tm diff --git a/pandas/tests/test_expressions.py b/pandas/tests/test_expressions.py index dc4787176a0b5..52cd3b023685e 100644 --- a/pandas/tests/test_expressions.py +++ b/pandas/tests/test_expressions.py @@ -17,7 +17,7 @@ from pandas.util.testing import (assert_almost_equal, assert_series_equal, assert_frame_equal, assert_panel_equal, assert_panel4d_equal, slow) -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing import pandas.util.testing as tm diff --git a/pandas/tests/test_generic.py b/pandas/tests/test_generic.py index 118039d1f354c..59aa61169f8b9 100644 --- a/pandas/tests/test_generic.py +++ b/pandas/tests/test_generic.py @@ -16,7 +16,7 @@ date_range, period_range, Panel4D) from pandas.core.index import MultiIndex -import pandas.formats.printing as printing +import pandas.core.formats.printing as printing from pandas.compat import range, zip, PY3 from pandas import compat diff --git a/pandas/tests/test_panel.py b/pandas/tests/test_panel.py index bc7bb8a4dfec1..b3d703c252431 100644 --- a/pandas/tests/test_panel.py +++ b/pandas/tests/test_panel.py @@ -16,7 +16,7 @@ from pandas.core.panel import Panel from pandas.core.series import remove_na -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing from pandas import compat from pandas.compat import range, lrange, StringIO, OrderedDict, signature diff --git a/pandas/tools/plotting.py b/pandas/tools/plotting.py index 141e3c74b91c4..00060cec1846d 100644 --- a/pandas/tools/plotting.py +++ b/pandas/tools/plotting.py @@ -28,7 +28,7 @@ from pandas.tseries.period import PeriodIndex from pandas.compat import range, lrange, lmap, map, zip, string_types import pandas.compat as compat -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing from pandas.util.decorators import Appender try: # mpl optional import pandas.tseries.converter as conv diff --git a/pandas/tseries/base.py b/pandas/tseries/base.py index 48d236177b474..a6523704abd45 100644 --- a/pandas/tseries/base.py +++ b/pandas/tseries/base.py @@ -20,7 +20,7 @@ from pandas.core.algorithms import checked_add_with_arr from pandas.core.common import AbstractMethodError -import pandas.formats.printing as printing +import pandas.core.formats.printing as printing from pandas._libs import (tslib as libts, lib, Timedelta, Timestamp, iNaT, NaT) from pandas._libs.period import Period diff --git a/pandas/tseries/index.py b/pandas/tseries/index.py index 2c14d4f8ea79e..a5ece37d1e5c4 100644 --- a/pandas/tseries/index.py +++ b/pandas/tseries/index.py @@ -685,12 +685,12 @@ def _mpl_repr(self): @cache_readonly def _is_dates_only(self): - from pandas.formats.format import _is_dates_only + from pandas.core.formats.format import _is_dates_only return _is_dates_only(self.values) @property def _formatter_func(self): - from pandas.formats.format import _get_format_datetime64 + from pandas.core.formats.format import _get_format_datetime64 formatter = _get_format_datetime64(is_dates_only=self._is_dates_only) return lambda x: "'%s'" % formatter(x, tz=self.tz) @@ -829,7 +829,8 @@ def _add_offset(self, offset): return self.astype('O') + offset def _format_native_types(self, na_rep='NaT', date_format=None, **kwargs): - 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(self, date_format) return libts.format_array_from_datetime(self.asi8, diff --git a/pandas/tseries/plotting.py b/pandas/tseries/plotting.py index 4eddf54701889..a314cc7258d2a 100644 --- a/pandas/tseries/plotting.py +++ b/pandas/tseries/plotting.py @@ -14,7 +14,7 @@ from pandas.tseries.index import DatetimeIndex from pandas.tseries.period import PeriodIndex from pandas.tseries.tdi import TimedeltaIndex -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing import pandas.compat as compat from pandas.tseries.converter import (TimeSeries_DateLocator, diff --git a/pandas/tseries/tdi.py b/pandas/tseries/tdi.py index d0f373fcc5a45..579b9163397f7 100644 --- a/pandas/tseries/tdi.py +++ b/pandas/tseries/tdi.py @@ -289,7 +289,7 @@ def _simple_new(cls, values, name=None, freq=None, **kwargs): @property def _formatter_func(self): - from pandas.formats.format import _get_format_timedelta64 + from pandas.core.formats.format import _get_format_timedelta64 return _get_format_timedelta64(self, box=True) def __setstate__(self, state): @@ -365,7 +365,7 @@ def _sub_datelike(self, other): def _format_native_types(self, na_rep=u('NaT'), date_format=None, **kwargs): - from pandas.formats.format import Timedelta64Formatter + from pandas.core.formats.format import Timedelta64Formatter return Timedelta64Formatter(values=self, nat_rep=na_rep, justify='all').get_result() diff --git a/pandas/util/testing.py b/pandas/util/testing.py index c73cca56f975a..c6993b4d9e601 100644 --- a/pandas/util/testing.py +++ b/pandas/util/testing.py @@ -32,7 +32,7 @@ is_interval_dtype, is_sequence, is_list_like) -from pandas.formats.printing import pprint_thing +from pandas.core.formats.printing import pprint_thing from pandas.core.algorithms import take_1d import pandas.compat as compat diff --git a/setup.py b/setup.py index 6707af7eb0908..4ef78cc9d9565 100755 --- a/setup.py +++ b/setup.py @@ -641,6 +641,7 @@ def pxd(name): 'pandas.compat.numpy', 'pandas.computation', 'pandas.core', + 'pandas.core.formats', 'pandas.indexes', 'pandas.errors', 'pandas.io', @@ -648,12 +649,12 @@ def pxd(name): 'pandas.io.sas', 'pandas.io.msgpack', 'pandas._libs', - 'pandas.formats', 'pandas.sparse', 'pandas.stats', 'pandas.util', 'pandas.tests', 'pandas.tests.api', + 'pandas.tests.core.formats', 'pandas.tests.computation', 'pandas.tests.frame', 'pandas.tests.indexes', @@ -667,7 +668,6 @@ def pxd(name): 'pandas.tests.io.msgpack', 'pandas.tests.groupby', 'pandas.tests.series', - 'pandas.tests.formats', 'pandas.tests.scalar', 'pandas.tests.sparse', 'pandas.tests.tseries',