removed unnecessary fullinfo argument from table2str() and format_value()

Author: alixdamman

larray/core/array.py

@@ -2282,8 +2282,7 @@ def __str__(self):
             maxwidth = OPTIONS[DISPLAY_WIDTH]
             precision = OPTIONS[DISPLAY_PRECISION]
             table = list(self.as_table(maxlines))
-            return table2str(table, 'nan', fullinfo=True, maxwidth=maxwidth, keepcols=self.ndim - 1,
-                             precision=precision)
+            return table2str(table, 'nan', maxwidth=maxwidth, keepcols=self.ndim - 1, precision=precision)
     __repr__ = __str__
 
     def __iter__(self):

larray/util/misc.py

@@ -81,23 +81,20 @@ def prod(values):
     return reduce(operator.mul, values, 1)
 
 
-def format_value(value, missing, fullinfo=False, precision=None):
-    if isinstance(value, float) and not fullinfo:
+def format_value(value, missing, precision=None):
+    if isinstance(value, float):
         # nans print as "-1.#J", let's use something nicer
         if value != value:
             return missing
         elif precision is not None:
-            return '{:2.{precision}f}'.format(value, precision=precision).rstrip('0').rstrip('.')
+            return '{:.{precision}f}'.format(value, precision=precision).rstrip('0').rstrip('.')
         else:
-            return '%2.f' % value
+            return str(value)
     elif isinstance(value, np.ndarray) and value.shape:
         # prevent numpy's default wrapping
         return str(list(value)).replace(',', '')
     else:
-        if isinstance(value, float) and precision is not None:
-            return '{:2.{precision}f}'.format(value, precision=precision).rstrip('0').rstrip('.')
-        else:
-            return str(value)
+        return str(value)
 
 
 def get_col_width(table, index):
@@ -136,8 +133,7 @@ def get_min_width(table, index):
     return max(longest_word(row[index]) for row in table)
 
 
-# XXX: what fullinfo is used for and when ?
-def table2str(table, missing, fullinfo=False, summarize=True, maxwidth=80, numedges='auto', sep='  ', cont='...',
+def table2str(table, missing, summarize=True, maxwidth=80, numedges='auto', sep='  ', cont='...',
               keepcols=0, precision=None):
     """
     table is a list of lists
@@ -150,7 +146,7 @@ def table2str(table, missing, fullinfo=False, summarize=True, maxwidth=80, numed
     for row in table:
         if len(row) < numcol:
             row.extend([''] * (numcol - len(row)))
-    formatted = [[format_value(value, missing, fullinfo, precision) for value in row]
+    formatted = [[format_value(value, missing, precision) for value in row]
                  for row in table]
     maxwidths = [get_col_width(formatted, i) for i in range(numcol)]