extract option values in LArray.__str__() instead of LArray.as_table() and table2str()

Author: alixdamman

larray/core/array.py

@@ -65,7 +65,7 @@
 from larray.util.misc import (table2str, size2str, basestring, izip, rproduct, ReprString, duplicates,
                               float_error_handler_factory, _isnoneslice, light_product, unique_list, common_type,
                               renamed_to, deprecate_kwarg, LHDFStore, lazy_attribute)
-from larray.util.options import OPTIONS, DISPLAY_MAXLINES, DISPLAY_EDGEITEMS
+from larray.util.options import OPTIONS, DISPLAY_MAXLINES, DISPLAY_EDGEITEMS, DISPLAY_WIDTH, DISPLAY_PRECISION
 
 
 def all(values, axis=None):
@@ -2278,8 +2278,9 @@ def __str__(self):
         elif not len(self):
             return 'LArray([])'
         else:
-            table = list(self.as_table())
-            return table2str(table, 'nan', keepcols=self.ndim - 1)
+            table = list(self.as_table(OPTIONS[DISPLAY_MAXLINES], OPTIONS[DISPLAY_EDGEITEMS]))
+            return table2str(table, 'nan', maxwidth=OPTIONS[DISPLAY_WIDTH], keepcols=self.ndim - 1,
+                             precision=OPTIONS[DISPLAY_PRECISION])
     __repr__ = __str__
 
     def __iter__(self):
@@ -2288,20 +2289,20 @@ def __iter__(self):
     def __contains__(self, key):
         return any(key in axis for axis in self.axes)
 
-    def as_table(self, maxlines=None, edgeitems=None, light=False, wide=True, value_name='value'):
+    def as_table(self, maxlines=-1, edgeitems=5, light=False, wide=True, value_name='value'):
         r"""
         Generator. Returns next line of the table representing an array.
 
         Parameters
         ----------
         maxlines : int, optional
-            Maximum number of lines to show. If 0 all lines are shown.
-            See :py:obj:`set_options` for default value.
+            Maximum number of lines to show. If negative all lines are shown.
+            Defaults to -1.
         edgeitems : int, optional
             If number of lines to display is greater than `maxlines`,
             only the first and last `edgeitems` lines are displayed.
             Only active if `maxlines` is not 0.
-            See :py:obj:`set_options` for default value.
+            Defaults to 5.
         light: bool, optional
             Whether or not printing the array in the same way as a pandas DataFrame with a MultiIndex
             (see example below). Defaults to False.
@@ -2351,12 +2352,6 @@ def as_table(self, maxlines=None, edgeitems=None, light=False, wide=True, value_
         if not self.ndim:
             return
 
-        # get default options
-        if maxlines is None:
-            maxlines = OPTIONS[DISPLAY_MAXLINES]
-        if edgeitems is None:
-            edgeitems = OPTIONS[DISPLAY_EDGEITEMS]
-
         # ert     unit  geo\time  2012    2011    2010
         # NEER27  I05   AT        101.41  101.63  101.63
         # NEER27  I05   AU        134.86  125.29  117.08
@@ -2432,7 +2427,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(maxlines=0, wide=wide, value_name=value_name))
+            return list(self.as_table(maxlines=-1, 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/misc.py

@@ -133,21 +133,14 @@ def get_min_width(table, index):
     return max(longest_word(row[index]) for row in table)
 
 
-def table2str(table, missing, summarize=True, maxwidth=None, numedges='auto', sep='  ', cont='...',
+def table2str(table, missing, summarize=True, maxwidth=200, numedges='auto', sep='  ', cont='...',
               keepcols=0, precision=None):
     """
     table is a list of lists
     :type table: list of list
     """
     if not table:
         return ''
-
-    from larray.util.options import OPTIONS, DISPLAY_WIDTH, DISPLAY_PRECISION
-    if maxwidth is None:
-        maxwidth = OPTIONS[DISPLAY_WIDTH]
-    if precision is None:
-        precision = OPTIONS[DISPLAY_PRECISION]
-
     numcol = max(len(row) for row in table)
     # pad rows that have too few columns
     for row in table:

larray/util/options.py

@@ -20,16 +20,16 @@
 }
 
 
+def _integer(value):
+    if not isinstance(value, int):
+        raise ValueError("Expected integer")
+
+
 def _positive_integer(value):
     if not (isinstance(value, int) and value > 0):
         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
@@ -40,7 +40,7 @@ def _positive_integer_or_none(value):
 _VALIDATORS = {
     DISPLAY_PRECISION: _positive_integer_or_none,
     DISPLAY_WIDTH: _positive_integer,
-    DISPLAY_MAXLINES: _non_negative_integer,
+    DISPLAY_MAXLINES: _integer,
     DISPLAY_EDGEITEMS: _positive_integer,
 }