CLN: move core/formats.py and core/style.py to formats

Author: jreback

pandas/core/api.py

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

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.core.format import detect_console_encoding
+from pandas.formats.format import detect_console_encoding
 
 #
 # options from the "display" namespace
@@ -110,7 +110,7 @@
     The callable should accept a floating point number and return
     a string with the desired format of the number. This is used
     in some places like SeriesFormatter.
-    See core.format.EngFormatter for an example.
+    See formats.format.EngFormatter for an example.
 """
 
 max_colwidth_doc = """

pandas/core/frame.py

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

pandas/core/internals.py

@@ -1431,7 +1431,7 @@ def to_native_types(self, slicer=None, na_rep='', float_format=None,
         if slicer is not None:
             values = values[:, slicer]
 
-        from pandas.core.format import FloatArrayFormatter
+        from pandas.formats.format import FloatArrayFormatter
         formatter = FloatArrayFormatter(values, na_rep=na_rep,
                                         float_format=float_format,
                                         decimal=decimal, quoting=quoting,
@@ -1606,7 +1606,7 @@ def to_native_types(self, slicer=None, na_rep=None, quoting=None,
         imask = (~mask).ravel()
 
         # FIXME:
-        # should use the core.format.Timedelta64Formatter here
+        # should use the formats.format.Timedelta64Formatter here
         # to figure what format to pass to the Timedelta
         # e.g. to not show the decimals say
         rvalues.flat[imask] = np.array([Timedelta(val)._repr_base(format='all')
@@ -2128,7 +2128,7 @@ def to_native_types(self, slicer=None, na_rep=None, date_format=None,
         if slicer is not None:
             values = values[..., slicer]
 
-        from pandas.core.format import _get_format_datetime64_from_values
+        from pandas.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/series.py

@@ -48,8 +48,8 @@
 
 import pandas.core.common as com
 import pandas.core.datetools as datetools
-import pandas.core.format as fmt
 import pandas.core.nanops as nanops
+import pandas.formats.format as fmt
 from pandas.util.decorators import Appender, deprecate_kwarg, Substitution
 
 import pandas.lib as lib

pandas/formats/__init__.py

@@ -33,7 +33,7 @@
 
 from pandas import DataFrame, Series, Index, Timestamp, MultiIndex, date_range, NaT
 
-import pandas.core.format as fmt
+import pandas.formats.format as fmt
 import pandas.util.testing as tm
 import pandas.core.common as com
 from pandas.util.terminal import get_terminal_size

pandas/core/format.py renamed to pandas/formats/format.py

@@ -22,7 +22,7 @@
     import jinja2  # noqa
 except ImportError:
     raise SkipTest("No Jinja2")
-from pandas.core.style import Styler  # noqa
+from pandas.formats.style import Styler  # noqa
 
 
 class TestStyler(TestCase):

pandas/core/style.py renamed to pandas/formats/style.py

@@ -609,7 +609,7 @@ def _format_data(self):
         """
         Return the formatted data as a unicode string
         """
-        from pandas.core.format import get_console_size, _get_adjustment
+        from pandas.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
@@ -1456,7 +1456,7 @@ def format(self, name=False, formatter=None, **kwargs):
     def _format_with_header(self, header, na_rep='NaN', **kwargs):
         values = self.values
 
-        from pandas.core.format import format_array
+        from pandas.formats.format import format_array
 
         if is_categorical_dtype(values.dtype):
             values = np.array(values)

pandas/formats/tests/__init__.py

@@ -724,7 +724,7 @@ def format(self, space=2, sparsify=None, adjoin=True, names=False,
                                       sentinel=sentinel)
 
         if adjoin:
-            from pandas.core.format import _get_adjustment
+            from pandas.formats.format import _get_adjustment
             adj = _get_adjustment()
             return adj.adjoin(space, *result_levels).split('\n')
         else:

pandas/tests/data/unicode_series.csv renamed to pandas/formats/tests/data/unicode_series.csv

@@ -292,7 +292,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.core.format import FloatArrayFormatter
+        from pandas.formats.format import FloatArrayFormatter
         formatter = FloatArrayFormatter(self.values, na_rep=na_rep,
                                         float_format=float_format,
                                         decimal=decimal, quoting=quoting,

pandas/tests/test_format.py renamed to pandas/formats/tests/test_format.py

@@ -1826,7 +1826,7 @@ def test_to_excel_styleconverter(self):
         self.assertEqual(kw['protection'], protection)
 
     def test_write_cells_merge_styled(self):
-        from pandas.core.format import ExcelCell
+        from pandas.formats.format import ExcelCell
         from openpyxl import styles
 
         sheet_name = 'merge_styled'
@@ -1939,7 +1939,7 @@ def test_write_cells_merge_styled(self):
         if not openpyxl_compat.is_compat(major_ver=2):
             raise nose.SkipTest('incompatiable openpyxl version')
 
-        from pandas.core.format import ExcelCell
+        from pandas.formats.format import ExcelCell
 
         sheet_name = 'merge_styled'
 

pandas/tests/test_style.py renamed to pandas/formats/tests/test_style.py

@@ -11,7 +11,7 @@
 
 from pandas import (DataFrame, compat, option_context)
 from pandas.compat import StringIO, lrange, u
-import pandas.core.format as fmt
+import pandas.formats.format as fmt
 import pandas as pd
 
 from numpy.testing.decorators import slow

pandas/indexes/base.py

@@ -15,7 +15,7 @@
 from pandas.core.common import notnull, isnull, array_equivalent
 import pandas.core.common as com
 import pandas.core.convert as convert
-import pandas.core.format as fmt
+import pandas.formats.format as fmt
 import pandas.util.testing as tm
 import pandas.core.config as cf
 

pandas/indexes/multi.py

@@ -691,12 +691,12 @@ def _mpl_repr(self):
 
     @cache_readonly
     def _is_dates_only(self):
-        from pandas.core.format import _is_dates_only
+        from pandas.formats.format import _is_dates_only
         return _is_dates_only(self.values)
 
     @property
     def _formatter_func(self):
-        from pandas.core.format import _get_format_datetime64
+        from pandas.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)
 
@@ -812,7 +812,7 @@ def _add_offset(self, offset):
 
     def _format_native_types(self, na_rep=u('NaT'),
                              date_format=None, **kwargs):
-        from pandas.core.format import _get_format_datetime64_from_values
+        from pandas.formats.format import _get_format_datetime64_from_values
         format = _get_format_datetime64_from_values(self, date_format)
 
         return tslib.format_array_from_datetime(self.asi8,

pandas/indexes/numeric.py

@@ -267,7 +267,7 @@ def _simple_new(cls, values, name=None, freq=None, **kwargs):
 
     @property
     def _formatter_func(self):
-        from pandas.core.format import _get_format_timedelta64
+        from pandas.formats.format import _get_format_timedelta64
         return _get_format_timedelta64(self, box=True)
 
     def __setstate__(self, state):
@@ -340,7 +340,7 @@ def _sub_datelike(self, other):
 
     def _format_native_types(self, na_rep=u('NaT'),
                              date_format=None, **kwargs):
-        from pandas.core.format import Timedelta64Formatter
+        from pandas.formats.format import Timedelta64Formatter
         return Timedelta64Formatter(values=self,
                                     nat_rep=na_rep,
                                     justify='all').get_result()

pandas/io/tests/test_excel.py

@@ -600,6 +600,7 @@ def pxd(name):
                     'pandas.tools': ['tests/*.csv'],
                     'pandas.tests': ['data/*.pickle',
                                      'data/*.csv'],
+                    'pandas.formats': ['data/*.csv'],
                     'pandas.tests.indexes': ['data/*.pickle'],
                     'pandas.tseries.tests': ['data/*.pickle',
                                              'data/*.csv']