Skip to content

Commit 1f812e3

Browse files
authored
CLN: move pandas.formats -> pandas.io.formats (pandas-dev#16013)
1 parent 39d7b11 commit 1f812e3

Some content is hidden

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

65 files changed

+78
-77
lines changed

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ global-exclude *.png
2525
# recursive-include LICENSES *
2626
include versioneer.py
2727
include pandas/_version.py
28-
include pandas/formats/templates/*.tpl
28+
include pandas/io/formats/templates/*.tpl

doc/source/whatsnew/v0.20.0.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1331,6 +1331,7 @@ If indicated, a deprecation warning will be issued if you reference theses modul
13311331
"pandas.hashtable", "pandas._libs.hashtable", ""
13321332
"pandas.json", "pandas.io.json.libjson", "X"
13331333
"pandas.parser", "pandas.io.libparsers", "X"
1334+
"pandas.formats", "pandas.io.formats", ""
13341335
"pandas.sparse", "pandas.core.sparse", ""
13351336
"pandas.types", "pandas.core.dtypes", ""
13361337
"pandas.io.sas.saslib", "pandas.io.sas.libsas", ""

pandas/core/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from pandas.core.dtypes.missing import isnull, notnull
99
from pandas.core.categorical import Categorical
1010
from pandas.core.groupby import Grouper
11-
from pandas.formats.format import set_eng_float_format
11+
from pandas.io.formats.format import set_eng_float_format
1212
from pandas.core.index import (Index, CategoricalIndex, Int64Index,
1313
UInt64Index, RangeIndex, Float64Index,
1414
MultiIndex, IntervalIndex)

pandas/core/categorical.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1615,7 +1615,7 @@ def _repr_categories(self):
16151615
""" return the base repr for the categories """
16161616
max_categories = (10 if get_option("display.max_categories") == 0 else
16171617
get_option("display.max_categories"))
1618-
from pandas.formats import format as fmt
1618+
from pandas.io.formats import format as fmt
16191619
if len(self.categories) > max_categories:
16201620
num = max_categories // 2
16211621
head = fmt.format_array(self.categories[:num], None)
@@ -1663,7 +1663,7 @@ def _repr_footer(self):
16631663
return u('Length: %d\n%s') % (len(self), self._repr_categories_info())
16641664

16651665
def _get_repr(self, length=True, na_rep='NaN', footer=True):
1666-
from pandas.formats import format as fmt
1666+
from pandas.io.formats import format as fmt
16671667
formatter = fmt.CategoricalFormatter(self, length=length,
16681668
na_rep=na_rep, footer=footer)
16691669
result = formatter.to_string()

pandas/core/computation/engines.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
from pandas import compat
88
from pandas.compat import map
9-
import pandas.formats.printing as printing
9+
import pandas.io.formats.printing as printing
1010
from pandas.core.computation.align import _align, _reconstruct_object
1111
from pandas.core.computation.ops import (
1212
UndefinedVariableError,

pandas/core/computation/eval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import warnings
77
import tokenize
8-
from pandas.formats.printing import pprint_thing
8+
from pandas.io.formats.printing import pprint_thing
99
from pandas.core.computation import _NUMEXPR_INSTALLED
1010
from pandas.core.computation.expr import Expr, _parsers, tokenize_string
1111
from pandas.core.computation.scope import _ensure_scope

pandas/core/computation/expr.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
from pandas.compat import StringIO, lmap, zip, reduce, string_types
1313
from pandas.core.base import StringMixin
1414
from pandas.core import common as com
15-
import pandas.formats.printing as printing
15+
import pandas.io.formats.printing as printing
1616
from pandas.tools.util import compose
1717
from pandas.core.computation.ops import (
1818
_cmp_ops_syms, _bool_ops_syms,

pandas/core/computation/ops.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import pandas as pd
1212
from pandas.compat import PY3, string_types, text_type
1313
import pandas.core.common as com
14-
from pandas.formats.printing import pprint_thing, pprint_thing_encoded
14+
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
1515
from pandas.core.base import StringMixin
1616
from pandas.core.computation.common import _ensure_decoded, _result_type_many
1717
from pandas.core.computation.scope import _DEFAULT_GLOBALS

pandas/core/computation/pytables.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import pandas.core.common as com
1010
from pandas.compat import u, string_types, DeepChainMap
1111
from pandas.core.base import StringMixin
12-
from pandas.formats.printing import pprint_thing, pprint_thing_encoded
12+
from pandas.io.formats.printing import pprint_thing, pprint_thing_encoded
1313
from pandas.core.computation import expr, ops
1414
from pandas.core.computation.ops import is_term, UndefinedVariableError
1515
from pandas.core.computation.expr import BaseExprVisitor

pandas/core/config.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -774,7 +774,7 @@ def is_instance_factory(_type):
774774
"""
775775
if isinstance(_type, (tuple, list)):
776776
_type = tuple(_type)
777-
from pandas.formats.printing import pprint_thing
777+
from pandas.io.formats.printing import pprint_thing
778778
type_repr = "|".join(map(pprint_thing, _type))
779779
else:
780780
type_repr = "'%s'" % _type
@@ -792,7 +792,7 @@ def is_one_of_factory(legal_values):
792792
legal_values = [c for c in legal_values if not callable(c)]
793793

794794
def inner(x):
795-
from pandas.formats.printing import pprint_thing as pp
795+
from pandas.io.formats.printing import pprint_thing as pp
796796
if x not in legal_values:
797797

798798
if not any([c(x) for c in callables]):

pandas/core/config_init.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from pandas.core.config import (is_int, is_bool, is_text, is_instance_factory,
1616
is_one_of_factory, get_default_val,
1717
is_callable)
18-
from pandas.formats.format import detect_console_encoding
18+
from pandas.io.formats.format import detect_console_encoding
1919

2020
#
2121
# options from the "display" namespace

pandas/core/frame.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
import pandas.core.common as com
9191
import pandas.core.nanops as nanops
9292
import pandas.core.ops as ops
93-
import pandas.formats.format as fmt
94-
from pandas.formats.printing import pprint_thing
93+
import pandas.io.formats.format as fmt
94+
from pandas.io.formats.printing import pprint_thing
9595
import pandas.plotting._core as gfx
9696

9797
from pandas._libs import lib, algos as libalgos
@@ -636,9 +636,9 @@ def style(self):
636636
637637
See Also
638638
--------
639-
pandas.formats.style.Styler
639+
pandas.io.formats.style.Styler
640640
"""
641-
from pandas.formats.style import Styler
641+
from pandas.io.formats.style import Styler
642642
return Styler(self)
643643

644644
def iteritems(self):
@@ -1724,7 +1724,7 @@ def info(self, verbose=None, buf=None, max_cols=None, memory_usage=None,
17241724
- If False, never show counts.
17251725
17261726
"""
1727-
from pandas.formats.format import _put_lines
1727+
from pandas.io.formats.format import _put_lines
17281728

17291729
if buf is None: # pragma: no cover
17301730
buf = sys.stdout

pandas/core/generic.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
import pandas.core.algorithms as algos
4444
import pandas.core.common as com
4545
import pandas.core.missing as missing
46-
from pandas.formats.printing import pprint_thing
47-
from pandas.formats.format import format_percentiles
46+
from pandas.io.formats.printing import pprint_thing
47+
from pandas.io.formats.format import format_percentiles
4848
from pandas.tseries.frequencies import to_offset
4949
from pandas import compat
5050
from pandas.compat.numpy import function as nv

pandas/core/groupby.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
decons_obs_group_ids, get_indexer_dict)
5656
from pandas.util.decorators import (cache_readonly, Substitution,
5757
Appender, make_signature)
58-
from pandas.formats.printing import pprint_thing
58+
from pandas.io.formats.printing import pprint_thing
5959
from pandas.util.validators import validate_kwargs
6060

6161
import pandas.core.algorithms as algorithms

pandas/core/internals.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
from pandas.core.indexing import maybe_convert_indices, length_of_indexer
5656
from pandas.core.categorical import Categorical, maybe_to_categorical
5757
from pandas.tseries.index import DatetimeIndex
58-
from pandas.formats.printing import pprint_thing
58+
from pandas.io.formats.printing import pprint_thing
5959

6060
import pandas.core.missing as missing
6161
from pandas.core.sparse.array import _maybe_to_sparse, SparseArray
@@ -1614,7 +1614,7 @@ def to_native_types(self, slicer=None, na_rep='', float_format=None,
16141614
values[mask] = na_rep
16151615
return values
16161616

1617-
from pandas.formats.format import FloatArrayFormatter
1617+
from pandas.io.formats.format import FloatArrayFormatter
16181618
formatter = FloatArrayFormatter(values, na_rep=na_rep,
16191619
float_format=float_format,
16201620
decimal=decimal, quoting=quoting,
@@ -2328,7 +2328,7 @@ def to_native_types(self, slicer=None, na_rep=None, date_format=None,
23282328
if slicer is not None:
23292329
values = values[..., slicer]
23302330

2331-
from pandas.formats.format import _get_format_datetime64_from_values
2331+
from pandas.io.formats.format import _get_format_datetime64_from_values
23322332
format = _get_format_datetime64_from_values(values, date_format)
23332333

23342334
result = tslib.format_array_from_datetime(

pandas/core/panel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from pandas.core.generic import NDFrame, _shared_docs
2727
from pandas.core.index import (Index, MultiIndex, _ensure_index,
2828
_get_combined_index)
29-
from pandas.formats.printing import pprint_thing
29+
from pandas.io.formats.printing import pprint_thing
3030
from pandas.core.indexing import maybe_droplevels
3131
from pandas.core.internals import (BlockManager,
3232
create_block_manager_from_arrays,

pandas/core/series.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
import pandas.core.common as com
6969
import pandas.core.nanops as nanops
70-
import pandas.formats.format as fmt
70+
import pandas.io.formats.format as fmt
7171
from pandas.util.decorators import Appender, deprecate_kwarg, Substitution
7272
from pandas.util.validators import validate_bool_kwarg
7373

pandas/core/sparse/array.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
from pandas._libs import index as libindex
3535
import pandas.core.algorithms as algos
3636
import pandas.core.ops as ops
37-
import pandas.formats.printing as printing
37+
import pandas.io.formats.printing as printing
3838
from pandas.util.decorators import Appender
3939
from pandas.indexes.base import _index_shared_docs
4040

pandas/core/sparse/list.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import warnings
22
import numpy as np
33
from pandas.core.base import PandasObject
4-
from pandas.formats.printing import pprint_thing
4+
from pandas.io.formats.printing import pprint_thing
55

66
from pandas.core.dtypes.common import is_scalar
77
from pandas.core.sparse.array import SparseArray

pandas/indexes/base.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
import pandas.core.dtypes.concat as _concat
4949
import pandas.core.missing as missing
5050
import pandas.core.algorithms as algos
51-
from pandas.formats.printing import pprint_thing
51+
from pandas.io.formats.printing import pprint_thing
5252
from pandas.core.ops import _comp_method_OBJECT_ARRAY
5353
from pandas.core.strings import StringAccessorMixin
5454
from pandas.core.config import get_option
@@ -831,7 +831,7 @@ def _format_data(self):
831831
"""
832832
Return the formatted data as a unicode string
833833
"""
834-
from pandas.formats.format import get_console_size, _get_adjustment
834+
from pandas.io.formats.format import get_console_size, _get_adjustment
835835
display_width, _ = get_console_size()
836836
if display_width is None:
837837
display_width = get_option('display.width') or 80
@@ -1842,7 +1842,7 @@ def format(self, name=False, formatter=None, **kwargs):
18421842
def _format_with_header(self, header, na_rep='NaN', **kwargs):
18431843
values = self.values
18441844

1845-
from pandas.formats.format import format_array
1845+
from pandas.io.formats.format import format_array
18461846

18471847
if is_categorical_dtype(values.dtype):
18481848
values = np.array(values)

pandas/indexes/frozen.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import numpy as np
1212
from pandas.core.base import PandasObject
1313
from pandas.core.dtypes.cast import coerce_indexer_dtype
14-
from pandas.formats.printing import pprint_thing
14+
from pandas.io.formats.printing import pprint_thing
1515

1616

1717
class FrozenList(PandasObject, list):

pandas/indexes/interval.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,7 @@ def _format_with_header(self, header, **kwargs):
921921

922922
def _format_native_types(self, na_rep='', quoting=None, **kwargs):
923923
""" actually format my specific types """
924-
from pandas.formats.format import IntervalArrayFormatter
924+
from pandas.io.formats.format import IntervalArrayFormatter
925925
return IntervalArrayFormatter(values=self,
926926
na_rep=na_rep,
927927
justify='all').get_result()

pandas/indexes/multi.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import pandas.core.common as com
3232
import pandas.core.missing as missing
3333
import pandas.core.algorithms as algos
34-
from pandas.formats.printing import pprint_thing
34+
from pandas.io.formats.printing import pprint_thing
3535

3636
from pandas.core.config import get_option
3737

@@ -935,7 +935,7 @@ def format(self, space=2, sparsify=None, adjoin=True, names=False,
935935
sentinel=sentinel)
936936

937937
if adjoin:
938-
from pandas.formats.format import _get_adjustment
938+
from pandas.io.formats.format import _get_adjustment
939939
adj = _get_adjustment()
940940
return adj.adjoin(space, *result_levels).split('\n')
941941
else:

pandas/indexes/numeric.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ def _convert_slice_indexer(self, key, kind=None):
302302

303303
def _format_native_types(self, na_rep='', float_format=None, decimal='.',
304304
quoting=None, **kwargs):
305-
from pandas.formats.format import FloatArrayFormatter
305+
from pandas.io.formats.format import FloatArrayFormatter
306306
formatter = FloatArrayFormatter(self.values, na_rep=na_rep,
307307
float_format=float_format,
308308
decimal=decimal, quoting=quoting,

pandas/io/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from pandas.io.packers import read_msgpack, to_msgpack
1919
from pandas.io.gbq import read_gbq
2020
try:
21-
from pandas.formats.style import Styler
21+
from pandas.io.formats.style import Styler
2222
except ImportError:
2323
from pandas.compat import add_metaclass as _add_metaclass
2424
from pandas.util.importing import _UnSubclassable

pandas/io/common.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
from pandas.compat import StringIO, BytesIO, string_types, text_type
1010
from pandas import compat
11-
from pandas.formats.printing import pprint_thing
11+
from pandas.io.formats.printing import pprint_thing
1212
from pandas.core.common import AbstractMethodError
1313
from pandas.core.dtypes.common import is_number, is_file_like
1414

pandas/io/excel.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from pandas.compat import (map, zip, reduce, range, lrange, u, add_metaclass,
2525
string_types, OrderedDict)
2626
from pandas.core import config
27-
from pandas.formats.printing import pprint_thing
27+
from pandas.io.formats.printing import pprint_thing
2828
import pandas.compat as compat
2929
import pandas.compat.openpyxl_compat as openpyxl_compat
3030
from warnings import warn
File renamed without changes.

pandas/formats/format.py pandas/io/formats/format.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
from pandas.util.terminal import get_terminal_size
3434
from pandas.core.config import get_option, set_option
3535
from pandas.io.common import _get_handle, UnicodeWriter, _expand_user
36-
from pandas.formats.printing import adjoin, justify, pprint_thing
36+
from pandas.io.formats.printing import adjoin, justify, pprint_thing
3737
import pandas.core.common as com
3838
import pandas._libs.lib as lib
3939
from pandas._libs.tslib import (iNaT, Timestamp, Timedelta,
File renamed without changes.

pandas/formats/style.py pandas/io/formats/style.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class Styler(object):
107107
--------
108108
pandas.DataFrame.style
109109
"""
110-
loader = PackageLoader("pandas", "formats/templates")
110+
loader = PackageLoader("pandas", "io/formats/templates")
111111
env = Environment(
112112
loader=loader,
113113
trim_blocks=True,
File renamed without changes.

pandas/io/html.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
raise_with_traceback, binary_type)
2222
from pandas import Series
2323
from pandas.core.common import AbstractMethodError
24-
from pandas.formats.printing import pprint_thing
24+
from pandas.io.formats.printing import pprint_thing
2525

2626
_IMPORTS = False
2727
_HAS_BS4 = False

pandas/io/json/json.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pandas import Series, DataFrame, to_datetime
1010
from pandas.io.common import get_filepath_or_buffer, _get_handle
1111
from pandas.core.common import AbstractMethodError
12-
from pandas.formats.printing import pprint_thing
12+
from pandas.io.formats.printing import pprint_thing
1313
from .normalize import _convert_to_line_delimits
1414
from .table_schema import build_table_schema
1515
from pandas.core.dtypes.common import is_period_dtype

pandas/io/pytables.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
from pandas.io.common import _stringify_path
3333
from pandas.core.sparse.array import BlockIndex, IntIndex
3434
from pandas.core.base import StringMixin
35-
from pandas.formats.printing import adjoin, pprint_thing
35+
from pandas.io.formats.printing import adjoin, pprint_thing
3636
from pandas.errors import PerformanceWarning
3737
from pandas.core.common import _asarray_tuplesafe
3838
from pandas.core.algorithms import match, unique

pandas/plotting/_core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from pandas.tseries.period import PeriodIndex
2525
from pandas.compat import range, lrange, map, zip, string_types
2626
import pandas.compat as compat
27-
from pandas.formats.printing import pprint_thing
27+
from pandas.io.formats.printing import pprint_thing
2828
from pandas.util.decorators import Appender
2929

3030
from pandas.plotting._compat import (_mpl_ge_1_3_1,

pandas/plotting/_misc.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from pandas.util.decorators import deprecate_kwarg
88
from pandas.core.dtypes.missing import notnull
99
from pandas.compat import range, lrange, lmap, zip
10-
from pandas.formats.printing import pprint_thing
10+
from pandas.io.formats.printing import pprint_thing
1111

1212

1313
from pandas.plotting._style import _get_standard_colors

pandas/plotting/_timeseries.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from pandas.tseries.index import DatetimeIndex
1010
from pandas.tseries.period import PeriodIndex
1111
from pandas.tseries.tdi import TimedeltaIndex
12-
from pandas.formats.printing import pprint_thing
12+
from pandas.io.formats.printing import pprint_thing
1313
import pandas.compat as compat
1414

1515
from pandas.plotting._converter import (TimeSeries_DateLocator,

0 commit comments

Comments
 (0)