set option DISPLAY_MAXLINES to 200 by default

Author: alixdamman

larray/core/array.py

@@ -2278,8 +2278,7 @@ def __str__(self):
         elif not len(self):
             return 'LArray([])'
         else:
-            maxlines = OPTIONS[DISPLAY_MAXLINES] if OPTIONS[DISPLAY_MAXLINES] is not None else 200
-            table = list(self.as_table(maxlines))
+            table = list(self.as_table())
             return table2str(table, 'nan', keepcols=self.ndim - 1)
     __repr__ = __str__
 
@@ -2296,7 +2295,7 @@ def as_table(self, maxlines=None, edgeitems=None, light=False, wide=True, value_
         Parameters
         ----------
         maxlines : int, optional
-            Maximum number of lines to show. Default behavior shows all lines.
+            Maximum number of lines to show. If 0 all lines are shown.
         edgeitems : int, optional
             If number of lines to display is greater than `maxlines`,
             only the first and last `edgeitems` lines are displayed.
@@ -2389,7 +2388,7 @@ def as_table(self, maxlines=None, edgeitems=None, light=False, wide=True, value_
         other_colnames = self.axes[-1].labels.tolist() if wide else [value_name]
         yield axes_names + other_colnames
         # summary if needed
-        if maxlines is not None and height > maxlines:
+        if maxlines > 0 and height > maxlines:
             # replace middle lines of the table by '...'.
             # We show only the first and last edgeitems lines.
             startticks = islice(ticks, edgeitems)
@@ -2431,7 +2430,7 @@ def dump(self, header=True, wide=True, value_name='value'):
             # flatten all dimensions except the last one
             return self.data.reshape(-1, self.shape[-1]).tolist()
         else:
-            return list(self.as_table(wide=wide, value_name=value_name))
+            return list(self.as_table(maxlines=0, wide=wide, value_name=value_name))
 
     # XXX: should filter(geo=['W']) return a view by default? (collapse=True)
     # I think it would be dangerous to make it the default

larray/util/options.py

@@ -15,7 +15,7 @@
 OPTIONS = {
     DISPLAY_PRECISION: None,
     DISPLAY_WIDTH: 80,
-    DISPLAY_MAXLINES: None,
+    DISPLAY_MAXLINES: 200,
     DISPLAY_EDGEITEMS: 5,
 }
 
@@ -25,6 +25,11 @@ def _positive_integer(value):
         raise ValueError("Expected positive integer")
 
 
+def _non_negative_integer(value):
+    if not (isinstance(value, int) and value >= 0):
+        raise ValueError("Expected non-negative integer")
+
+
 def _positive_integer_or_none(value):
     if value is None:
         return
@@ -35,7 +40,7 @@ def _positive_integer_or_none(value):
 _VALIDATORS = {
     DISPLAY_PRECISION: _positive_integer_or_none,
     DISPLAY_WIDTH: _positive_integer,
-    DISPLAY_MAXLINES: _positive_integer_or_none,
+    DISPLAY_MAXLINES: _non_negative_integer,
     DISPLAY_EDGEITEMS: _positive_integer,
 }
 
@@ -48,7 +53,8 @@ class set_options(object):
 
     - ``display_precision``: number of digits of precision for floating point output.
     - ``display_width``: maximum display width for ``repr`` on larray objects. Defaults to 80.
-    - ``display_maxlines``: Maximum number of lines to show. Default behavior shows all lines.
+    - ``display_maxlines``: Maximum number of lines to show. If 0 all lines are shown.
+      Defaults to 200.
     - ``display_edgeitems`` : if number of lines to display is greater than ``display_maxlines``,
       only the first and last ``display_edgeitems`` lines are displayed.
       Only active if ``display_maxlines`` is not None. Defaults to 5.