some fixes after review

harelba · harelba · commit 1319aeb6201c · 2018-12-10T18:43:49.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -10,5 +10,5 @@ matrix:
     - python: "3.6"
     - python: "3.7"
 install: pip install -r requirements.txt
-before_script: flake8 ./bin/q --count --select=E901,E999,F821,F822,F823 --show-source --statistics
+before_script: flake8 ./bin/q ./test/test-suite --count --select=E901,E999,F821,F822,F823 --show-source --statistics
 script: test/test-all
diff --git a/bin/q b/bin/q
@@ -1106,7 +1106,8 @@ def determine_max_col_lengths(m,output_field_quoting_func,output_delimiter):
     max_lengths = [0 for x in range(0, len(m[0]))]
     for row_index in range(0, len(m)):
         for col_index in range(0, len(m[0])):
-            new_len = len(unicode(output_field_quoting_func(output_delimiter,m[row_index][col_index])))
+            # TODO Optimize this and make sure that py2 hack of float precision is applied here as well
+            new_len = len("{}".format(output_field_quoting_func(output_delimiter,m[row_index][col_index])))
             if new_len > max_lengths[col_index]:
                 max_lengths[col_index] = new_len
     return max_lengths
@@ -1591,7 +1592,7 @@ class QOutputPrinter(object):
                         fmt_str = formatting_dict[str(i + 1)]
                     else:
                         if self.output_params.beautify:
-                            fmt_str = six.u("{{0:<{}}}") % max_lengths[i]
+                            fmt_str = six.u("{{0:<{}}}").format(max_lengths[i])
                         else:
                             fmt_str = six.u("{}")
 
