remove shortcut parameter from format_array

pandas/core/indexes/interval.py

@@ -1019,6 +1019,7 @@ def _format_native_types(self, na_rep='NaN', quoting=None, **kwargs):
         """ actually format my specific types """
         from pandas.io.formats.format import ExtensionArrayFormatter
         return ExtensionArrayFormatter(values=self,
+                                       formatter=False,
                                        na_rep=na_rep,
                                        justify='all',
                                        leading_space=False).get_result()

pandas/io/formats/format.py

@@ -717,11 +717,9 @@ def _format_col(self, i):
         frame = self.tr_frame
         formatter = self._get_formatter(i)
         values_to_format = frame.iloc[:, i]._formatting_values()
-        shortcut = formatter is not None
         return format_array(values_to_format, formatter,
                             float_format=self.float_format, na_rep=self.na_rep,
-                            space=self.col_space, decimal=self.decimal,
-                            shortcut=shortcut)
+                            space=self.col_space, decimal=self.decimal)
 
     def to_html(self, classes=None, notebook=False, border=None):
         """
@@ -858,7 +856,7 @@ def _get_column_name_list(self):
 
 def format_array(values, formatter, float_format=None, na_rep='NaN',
                  digits=None, space=None, justify='right', decimal='.',
-                 leading_space=None, shortcut=False):
+                 leading_space=None):
     """
     Format an array for printing.
 
@@ -880,9 +878,6 @@ def format_array(values, formatter, float_format=None, na_rep='NaN',
         When formatting an Index subclass
         (e.g. IntervalIndex._format_native_types), we don't want the
         leading space since it should be left-aligned.
-    shortcut : bool, optional, default False
-        Whether to shortcut the formatting options. Used when specifying
-        custom formatters in to_string, to_latex and to_html
 
     Returns
     -------
@@ -916,7 +911,7 @@ def format_array(values, formatter, float_format=None, na_rep='NaN',
     fmt_obj = fmt_klass(values, digits=digits, na_rep=na_rep,
                         float_format=float_format, formatter=formatter,
                         space=space, justify=justify, decimal=decimal,
-                        leading_space=leading_space, shortcut=shortcut)
+                        leading_space=leading_space)
 
     return fmt_obj.get_result()
 
@@ -925,8 +920,7 @@ class GenericArrayFormatter(object):
 
     def __init__(self, values, digits=7, formatter=None, na_rep='NaN',
                  space=12, float_format=None, justify='right', decimal='.',
-                 quoting=None, fixed_width=True, leading_space=None,
-                 shortcut=False):
+                 quoting=None, fixed_width=True, leading_space=None):
         self.values = values
         self.digits = digits
         self.na_rep = na_rep
@@ -938,16 +932,15 @@ def __init__(self, values, digits=7, formatter=None, na_rep='NaN',
         self.quoting = quoting
         self.fixed_width = fixed_width
         self.leading_space = leading_space
-        self.shortcut = shortcut
 
     def get_result(self):
         fmt_values = self._format_strings()
         return _make_fixed_width(fmt_values, self.justify)
 
     def _format_strings(self):
         # shortcut
-        if self.formatter is not None and self.shortcut:
-            return [self.formatter(x) for x in self.values]
+        if self.formatter is not None:
+            return [' {}'.format(self.formatter(x)) for x in self.values]
 
         if self.float_format is None:
             float_format = get_option("display.float_format")
@@ -1199,7 +1192,10 @@ def _format_strings(self):
         if isinstance(values, (ABCIndexClass, ABCSeries)):
             values = values._values
 
-        formatter = values._formatter(boxed=True)
+        if self.formatter is None:
+            formatter = values._formatter(boxed=True)
+        elif self.formatter is False:
+            formatter = None
 
         if is_categorical_dtype(values.dtype):
             # Categorical is special for now, so that we can preserve tzinfo

pandas/tests/io/formats/test_format.py

@@ -511,10 +511,10 @@ def test_to_string_with_formatters(self):
                       ('object', lambda x: '-{x!s}-'.format(x=x))]
         result = df.to_string(formatters=dict(formatters))
         result2 = df.to_string(formatters=lzip(*formatters)[1])
-        assert result == ('  int  float   object\n'
-                          '0 0x1 [ 1.0] -(1, 2)-\n'
-                          '1 0x2 [ 2.0]   -True-\n'
-                          '2 0x3 [ 3.0]  -False-')
+        assert result == ('  int  float    object\n'
+                          '0 0x1 [ 1.0]  -(1, 2)-\n'
+                          '1 0x2 [ 2.0]    -True-\n'
+                          '2 0x3 [ 3.0]   -False-')
         assert result == result2
 
     def test_to_string_with_datetime64_monthformatter(self):

pandas/tests/io/formats/test_to_latex.py

@@ -125,11 +125,11 @@ def test_to_latex_with_formatters(self):
 
         expected = r"""\begin{tabular}{llrrl}
 \toprule
-{} & datetime64 &  float & int &   object \\
+{} & datetime64 &  float & int &    object \\
 \midrule
-index: 0 &    2016-01 & [ 1.0] & 0x1 & -(1, 2)- \\
-index: 1 &    2016-02 & [ 2.0] & 0x2 &   -True- \\
-index: 2 &    2016-03 & [ 3.0] & 0x3 &  -False- \\
+index: 0 &    2016-01 & [ 1.0] & 0x1 &  -(1, 2)- \\
+index: 1 &    2016-02 & [ 2.0] & 0x2 &    -True- \\
+index: 2 &    2016-03 & [ 3.0] & 0x3 &   -False- \\
 \bottomrule
 \end{tabular}
 """