adjust index display to max_seq_items

Author: jreback

pandas/core/index.py

@@ -411,24 +411,57 @@ def __unicode__(self):
         py2/py3.
         """
         klass = self.__class__.__name__
-        space = ' ' * (len(klass) + 1)
         data = self._format_data()
         attrs = self._format_attrs()
-        prepr = (u(",\n%s") % space).join([u("%s=%s") % (k, v)
+        max_seq_items = get_option('display.max_seq_items')
+        if len(self) > max_seq_items:
+            space = "\n%s" % (' ' * (len(klass) + 1))
+        else:
+            space = " "
+
+        prepr = (u(",%s") % space).join([u("%s=%s") % (k, v)
                                           for k, v in attrs])
-        res = u("%s(%s,\n%s%s)") % (klass,
-                                    data,
-                                    space,
-                                    prepr)
+        res = u("%s(%s,%s%s)") % (klass,
+                                  data,
+                                  space,
+                                  prepr)
 
         return res
 
+    @property
+    def _formatter_func(self):
+        """
+        Return the formatted data as a unicode string
+        """
+        return default_pprint
+
     def _format_data(self):
         """
         Return the formatted data as a unicode string
         """
-        return com.pprint_thing(self, escape_chars=('\t', '\r', '\n'),
-                                quote_strings=True)
+
+        max_seq_items = get_option('display.max_seq_items')
+        formatter = self._formatter_func
+        n = len(self)
+        if n == 0:
+            summary = '[]'
+        elif n == 1:
+            first = formatter(self[0])
+            summary = '[%s]' % first
+        elif n == 2:
+            first = formatter(self[0])
+            last = formatter(self[-1])
+            summary = '[%s, %s]' % (first, last)
+        elif n > max_seq_items:
+            n = min(max_seq_items//2,2)
+            head = ', '.join([ formatter(x) for x in self[:n] ])
+            tail = ', '.join([ formatter(x) for x in self[-n:] ])
+            summary = '[%s, ..., %s]' % (head, tail)
+        else:
+            summary = "[%s]" % ', '.join([ formatter(x) for x in self ])
+
+        return summary
+
 
     def _format_attrs(self):
         """

pandas/tseries/base.py

@@ -260,29 +260,6 @@ def _formatter_func(self):
         """
         return str
 
-    def _format_data(self):
-        """
-        Return the formatted data as a unicode string
-        """
-
-        formatter = self._formatter_func
-        n = len(self)
-        if n == 0:
-            summary = '[]'
-        elif n == 1:
-            first = formatter(self[0])
-            summary = '[%s]' % first
-        elif n == 2:
-            first = formatter(self[0])
-            last = formatter(self[-1])
-            summary = '[%s, %s]' % (first, last)
-        else:
-            first = formatter(self[0])
-            last = formatter(self[-1])
-            summary = '[%s, ..., %s]' % (first, last)
-
-        return summary
-
     def _format_attrs(self):
         """
         Return a list of tuples of the (attr,formatted_value)

pandas/tseries/index.py

@@ -597,7 +597,7 @@ def _is_dates_only(self):
     def _formatter_func(self):
         from pandas.core.format import _get_format_datetime64
         formatter = _get_format_datetime64(is_dates_only=self._is_dates_only)
-        return lambda x: formatter(x, tz=self.tz)
+        return lambda x: "'%s'" % formatter(x, tz=self.tz)
 
     def __reduce__(self):