CLN: move pprint_thing to printing

Author: jreback

ci/lint.sh

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

pandas/computation/engines.py

@@ -7,7 +7,8 @@
 
 from pandas import compat
 from pandas.compat import DeepChainMap, map
-from pandas.core import common as com
+import pandas.core.common as com
+import pandas.formats.printing as printing
 from pandas.computation.align import _align, _reconstruct_object
 from pandas.computation.ops import (UndefinedVariableError,
                                     _mathops, _reductions)
@@ -55,7 +56,7 @@ def convert(self):
 
         Defaults to return the expression as a string.
         """
-        return com.pprint_thing(self.expr)
+        return printing.pprint_thing(self.expr)
 
     def evaluate(self):
         """Run the engine on the expression

pandas/computation/eval.py

@@ -5,7 +5,7 @@
 
 import warnings
 import tokenize
-from pandas.core import common as com
+from pandas.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
@@ -108,7 +108,7 @@ def _convert_expression(expr):
     ValueError
       * If the expression is empty.
     """
-    s = com.pprint_thing(expr)
+    s = pprint_thing(expr)
     _check_expression(s)
     return s
 

pandas/computation/expr.py

@@ -11,6 +11,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
 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)
@@ -716,7 +717,7 @@ def __call__(self):
         return self.terms(self.env)
 
     def __unicode__(self):
-        return com.pprint_thing(self.terms)
+        return printing.pprint_thing(self.terms)
 
     def __len__(self):
         return len(self.expr)

pandas/computation/ops.py

@@ -10,6 +10,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
 import pandas.lib as lib
 from pandas.core.base import StringMixin
 from pandas.computation.common import _ensure_decoded, _result_type_many
@@ -62,7 +63,7 @@ def local_name(self):
         return self.name.replace(_LOCAL_TAG, '')
 
     def __unicode__(self):
-        return com.pprint_thing(self.name)
+        return pprint_thing(self.name)
 
     def __call__(self, *args, **kwargs):
         return self.value
@@ -118,9 +119,9 @@ def type(self):
 
     @property
     def raw(self):
-        return com.pprint_thing('{0}(name={1!r}, type={2})'
-                                ''.format(self.__class__.__name__, self.name,
-                                          self.type))
+        return pprint_thing('{0}(name={1!r}, type={2})'
+                            ''.format(self.__class__.__name__, self.name,
+                                      self.type))
 
     @property
     def is_datetime(self):
@@ -186,9 +187,9 @@ def __unicode__(self):
         """Print a generic n-ary operator and its operands using infix
         notation"""
         # recurse over the operands
-        parened = ('({0})'.format(com.pprint_thing(opr))
+        parened = ('({0})'.format(pprint_thing(opr))
                    for opr in self.operands)
-        return com.pprint_thing(' {0} '.format(self.op).join(parened))
+        return pprint_thing(' {0} '.format(self.op).join(parened))
 
     @property
     def return_type(self):
@@ -390,10 +391,10 @@ def convert_values(self):
         """
         def stringify(value):
             if self.encoding is not None:
-                encoder = partial(com.pprint_thing_encoded,
+                encoder = partial(pprint_thing_encoded,
                                   encoding=self.encoding)
             else:
-                encoder = com.pprint_thing
+                encoder = pprint_thing
             return encoder(value)
 
         lhs, rhs = self.lhs, self.rhs
@@ -491,7 +492,7 @@ def __call__(self, env):
         return self.func(operand)
 
     def __unicode__(self):
-        return com.pprint_thing('{0}({1})'.format(self.op, self.operand))
+        return pprint_thing('{0}({1})'.format(self.op, self.operand))
 
     @property
     def return_type(self):
@@ -516,7 +517,7 @@ def __call__(self, env):
 
     def __unicode__(self):
         operands = map(str, self.operands)
-        return com.pprint_thing('{0}({1})'.format(self.op, ','.join(operands)))
+        return pprint_thing('{0}({1})'.format(self.op, ','.join(operands)))
 
 
 class FuncNode(object):

pandas/computation/pytables.py

@@ -7,9 +7,10 @@
 from datetime import datetime, timedelta
 import numpy as np
 import pandas as pd
+import pandas.core.common as com
 from pandas.compat import u, string_types, DeepChainMap
 from pandas.core.base import StringMixin
-import pandas.core.common as com
+from pandas.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
@@ -169,10 +170,10 @@ def convert_value(self, v):
 
         def stringify(value):
             if self.encoding is not None:
-                encoder = partial(com.pprint_thing_encoded,
+                encoder = partial(pprint_thing_encoded,
                                   encoding=self.encoding)
             else:
-                encoder = com.pprint_thing
+                encoder = pprint_thing
             return encoder(value)
 
         kind = _ensure_decoded(self.kind)
@@ -224,8 +225,8 @@ def convert_values(self):
 class FilterBinOp(BinOp):
 
     def __unicode__(self):
-        return com.pprint_thing("[Filter : [{0}] -> "
-                                "[{1}]".format(self.filter[0], self.filter[1]))
+        return pprint_thing("[Filter : [{0}] -> "
+                            "[{1}]".format(self.filter[0], self.filter[1]))
 
     def invert(self):
         """ invert the filter """
@@ -296,7 +297,7 @@ def evaluate(self):
 class ConditionBinOp(BinOp):
 
     def __unicode__(self):
-        return com.pprint_thing("[Condition : [{0}]]".format(self.condition))
+        return pprint_thing("[Condition : [{0}]]".format(self.condition))
 
     def invert(self):
         """ invert the condition """
@@ -571,8 +572,8 @@ def convert(v):
 
     def __unicode__(self):
         if self.terms is not None:
-            return com.pprint_thing(self.terms)
-        return com.pprint_thing(self.expr)
+            return pprint_thing(self.terms)
+        return pprint_thing(self.expr)
 
     def evaluate(self):
         """ create and return the numexpr condition and filter """

pandas/core/base.py

@@ -10,6 +10,7 @@
 from pandas.util.decorators import (Appender, cache_readonly,
                                     deprecate_kwarg, Substitution)
 from pandas.core.common import AbstractMethodError
+from pandas.formats.printing import pprint_thing
 
 _shared_docs = dict()
 _indexops_doc_kwargs = dict(klass='IndexOpsMixin', inplace='',
@@ -680,7 +681,6 @@ def _disabled(self, *args, **kwargs):
                         self.__class__.__name__)
 
     def __unicode__(self):
-        from pandas.core.common import pprint_thing
         return pprint_thing(self, quote_strings=True,
                             escape_chars=('\t', '\r', '\n'))
 
@@ -724,8 +724,8 @@ def __unicode__(self):
         Invoked by unicode(df) in py2 only. Yields a Unicode String in both
         py2/py3.
         """
-        prepr = com.pprint_thing(self, escape_chars=('\t', '\r', '\n'),
-                                 quote_strings=True)
+        prepr = pprint_thing(self, escape_chars=('\t', '\r', '\n'),
+                             quote_strings=True)
         return "%s(%s, dtype='%s')" % (type(self).__name__, prepr, self.dtype)
 
 

pandas/core/categorical.py

@@ -1433,7 +1433,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.core import format as fmt
+        from pandas.formats import format as fmt
         if len(self.categories) > max_categories:
             num = max_categories // 2
             head = fmt.format_array(self.categories[:num], None)
@@ -1481,7 +1481,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.core import format as fmt
+        from pandas.formats import format as fmt
         formatter = fmt.CategoricalFormatter(self, length=length,
                                              na_rep=na_rep, footer=footer)
         result = formatter.to_string()

pandas/core/common.py

@@ -14,7 +14,7 @@
 import pandas.lib as lib
 import pandas.tslib as tslib
 from pandas import compat
-from pandas.compat import (range, long, u, zip, map, string_types,
+from pandas.compat import (long, zip, map, string_types,
                            iteritems)
 from pandas.types import api as gt
 from pandas.types.api import *  # noqa

pandas/core/config.py

@@ -773,7 +773,7 @@ def is_instance_factory(_type):
     """
     if isinstance(_type, (tuple, list)):
         _type = tuple(_type)
-        from pandas.core.common import pprint_thing
+        from pandas.formats.printing import pprint_thing
         type_repr = "|".join(map(pprint_thing, _type))
     else:
         type_repr = "'%s'" % _type
@@ -791,7 +791,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.core.common import pprint_thing as pp
+        from pandas.formats.printing import pprint_thing as pp
         if x not in legal_values:
 
             if not any([c(x) for c in callables]):

pandas/core/frame.py

@@ -57,6 +57,7 @@
 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.tools.plotting as gfx
 
 import pandas.lib as lib
@@ -1668,7 +1669,7 @@ def info(self, verbose=None, buf=None, max_cols=None, memory_usage=None,
         def _verbose_repr():
             lines.append('Data columns (total %d columns):' %
                          len(self.columns))
-            space = max([len(com.pprint_thing(k)) for k in self.columns]) + 4
+            space = max([len(pprint_thing(k)) for k in self.columns]) + 4
             counts = None
 
             tmpl = "%s%s"
@@ -1682,7 +1683,7 @@ def _verbose_repr():
             dtypes = self.dtypes
             for i, col in enumerate(self.columns):
                 dtype = dtypes.iloc[i]
-                col = com.pprint_thing(col)
+                col = pprint_thing(col)
 
                 count = ""
                 if show_counts:
@@ -4145,7 +4146,7 @@ def _apply_standard(self, func, axis, ignore_failures=False, reduce=True):
                     if i is not None:
                         k = res_index[i]
                         e.args = e.args + ('occurred at index %s' %
-                                           com.pprint_thing(k), )
+                                           pprint_thing(k), )
                 raise
 
         if len(results) > 0 and is_sequence(results[0]):

pandas/core/generic.py

@@ -19,6 +19,7 @@
 import pandas.core.common as com
 import pandas.core.missing as missing
 import pandas.core.datetools as datetools
+from pandas.formats.printing import pprint_thing
 from pandas import compat
 from pandas.compat import (map, zip, lrange, string_types,
                            isidentifier, set_function_name)
@@ -150,7 +151,7 @@ def _constructor(self):
     def __unicode__(self):
         # unicode representation based upon iterating over self
         # (since, by definition, `PandasContainers` are iterable)
-        prepr = '[%s]' % ','.join(map(com.pprint_thing, self))
+        prepr = '[%s]' % ','.join(map(pprint_thing, self))
         return '%s(%s)' % (self.__class__.__name__, prepr)
 
     def _dir_additions(self):

pandas/core/groupby.py

@@ -24,6 +24,7 @@
 from pandas.core.panel import Panel
 from pandas.util.decorators import (cache_readonly, Substitution, Appender,
                                     make_signature, deprecate_kwarg)
+from pandas.formats.printing import pprint_thing
 import pandas.core.algorithms as algos
 import pandas.core.common as com
 from pandas.core.common import(_possibly_downcast_to_dtype, isnull,
@@ -2213,7 +2214,7 @@ def __init__(self, index, grouper=None, obj=None, name=None, level=None,
                         len(self.grouper) == len(self.index)):
                     errmsg = ('Grouper result violates len(labels) == '
                               'len(data)\nresult: %s' %
-                              com.pprint_thing(self.grouper))
+                              pprint_thing(self.grouper))
                     self.grouper = None  # Try for sanity
                     raise AssertionError(errmsg)
 

pandas/core/internals.py

@@ -27,6 +27,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
 import pandas.core.common as com
 import pandas.core.missing as missing
 import pandas.core.convert as convert
@@ -195,15 +196,15 @@ def mgr_locs(self, new_mgr_locs):
     def __unicode__(self):
 
         # don't want to print out all of the items here
-        name = com.pprint_thing(self.__class__.__name__)
+        name = pprint_thing(self.__class__.__name__)
         if self._is_single_block:
 
             result = '%s: %s dtype: %s' % (name, len(self), self.dtype)
 
         else:
 
-            shape = ' x '.join([com.pprint_thing(s) for s in self.shape])
-            result = '%s: %s, %s, dtype: %s' % (name, com.pprint_thing(
+            shape = ' x '.join([pprint_thing(s) for s in self.shape])
+            result = '%s: %s, %s, dtype: %s' % (name, pprint_thing(
                 self.mgr_locs.indexer), shape, self.dtype)
 
         return result
@@ -2783,15 +2784,15 @@ def __len__(self):
         return len(self.items)
 
     def __unicode__(self):
-        output = com.pprint_thing(self.__class__.__name__)
+        output = pprint_thing(self.__class__.__name__)
         for i, ax in enumerate(self.axes):
             if i == 0:
                 output += u('\nItems: %s') % ax
             else:
                 output += u('\nAxis %d: %s') % (i, ax)
 
         for block in self.blocks:
-            output += u('\n%s') % com.pprint_thing(block)
+            output += u('\n%s') % pprint_thing(block)
         return output
 
     def _verify_integrity(self):

pandas/core/panel.py

@@ -22,6 +22,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.indexing import maybe_droplevels
 from pandas.core.internals import (BlockManager,
                                    create_block_manager_from_arrays,
@@ -345,8 +346,8 @@ def axis_pretty(a):
             v = getattr(self, a)
             if len(v) > 0:
                 return u('%s axis: %s to %s') % (a.capitalize(),
-                                                 com.pprint_thing(v[0]),
-                                                 com.pprint_thing(v[-1]))
+                                                 pprint_thing(v[0]),
+                                                 pprint_thing(v[-1]))
             else:
                 return u('%s axis: None') % a.capitalize()