more fixes

Author: jreback

doc/source/whatsnew/v0.16.1.txt

@@ -12,10 +12,9 @@ Highlights include:
 - Support for a ``CategoricalIndex``, a category based index, see :ref:`here <whatsnew_0161.enhancements.categoricalindex>`
 - New section on how-to-contribute to *pandas*, see :ref:`here <contributing>`
 - Revised "Merge, join, and concatenate" documentation including graphical examples to make it easier to understand each operations, see :ref:`here <merging>`
-
+- The default ``Index`` printing has changed to a more uniform format, see :ref:`here <whatsnew_0161.index_repr>`
 - New method ``sample`` for drawing random samples from Series, DataFrames and Panels. See :ref:`here <whatsnew_0161.enchancements.sample>`
-
-- ``BusinessHour`` offset is supported, see :ref:`here <timeseries.businesshour>`
+- ``BusinessHour`` datetime-offset is now supported, see :ref:`here <timeseries.businesshour>`
 
 -  Further enhancement to the ``.str`` accessor to make string operations easier, see :ref:`here <whatsnew_0161.enhancements.string>`
 
@@ -288,8 +287,10 @@ New Behavior
 
    pd.get_option('max_seq_items')
    pd.Index(range(4),name='foo')
+   pd.Index(range(25),name='foo')
    pd.Index(range(104),name='foo')
    pd.date_range('20130101',periods=4,name='foo',tz='US/Eastern')
+   pd.date_range('20130101',periods=25,name='foo',tz='US/Eastern')
    pd.date_range('20130101',periods=104,name='foo',tz='US/Eastern')
 
 .. _whatsnew_0161.performance:

pandas/core/index.py

@@ -434,8 +434,8 @@ def _format_data(self):
         """
         Return the formatted data as a unicode string
         """
-        space1 = "\n%s" % (' ' * (len(self.__class__.__name__) + 2))
-        space2 = "\n%s" % (' ' * (len(self.__class__.__name__) + 1))
+        space1 = "\n%s" % (' ' * (len(self.__class__.__name__) + 1))
+        space2 = "\n%s" % (' ' * (len(self.__class__.__name__) + 2))
 
         sep = ','
         max_seq_items = get_option('display.max_seq_items')
@@ -448,7 +448,7 @@ def best_rows(values, max_len):
             from pandas.core.format import get_console_size
             display_width, _ = get_console_size()
             if display_width is None:
-                display_width = 80
+                display_width = get_option('display.width')
             n_per_row = (display_width - len(self.__class__.__name__) - 2) // max_len
             n_rows = int(ceil(len(values) / float(n_per_row)))
             return n_per_row, n_rows
@@ -460,7 +460,7 @@ def best_fit(values, max_len, justify=False):
 
             # adjust all values to max length if we have multi-lines
             if n_rows > 1 or justify:
-                values = [x.rjust(max_len) for x in values]
+                values = [values[0].rjust(max_len-2)] + [x.rjust(max_len-1) for x in values[1:]]
                 sep_elements = sep
             else:
                 sep_elements = sep + ' '
@@ -493,10 +493,10 @@ def best_fit(values, max_len, justify=False):
 
             summary = '['
             summary += best_fit(head, max_len, justify=True)
-            summary += space1 + ' ...' + space1
+            summary += ',' + space1 + ' ...' + space2
             summary += best_fit(tail, max_len, justify=True)
             summary += '],'
-            summary += space2
+            summary += space1
 
         else:
             values = [ formatter(x) for x in self ]
@@ -508,7 +508,7 @@ def best_fit(values, max_len, justify=False):
             summary += best_fit(values, max_len)
             summary += '],'
             if n_rows > 1:
-                summary += space2
+                summary += space1
             else:
                 summary += ' '