Handle integers too when printing CSV

Signed-off-by: Stephen Finucane <stephen@that.guru>
Fixes: 63e8ea1 ("Resolves issues with CSV printing on Python 2")

Author: stephenfin

git_pw/utils.py

@@ -15,6 +15,15 @@
 from tabulate import tabulate
 
 
+def ensure_str(s):
+    if s is None:
+        s = ''
+    elif not isinstance(s, (six.text_type, six.binary_type)):
+        s = str(s)
+
+    return six.ensure_str(s)
+
+
 def trim(string, length=70):  # type: (str, int) -> str
     """Trim a string to the given length."""
     return (string[:length - 1] + '...') if len(string) > length else string
@@ -63,10 +72,9 @@ def _tabulate(output, headers, fmt):
         result = six.StringIO()
         writer = csv.writer(
             result, quoting=csv.QUOTE_ALL, lineterminator=os.linesep)
-        writer.writerow([six.ensure_str(h) for h in headers])
+        writer.writerow([ensure_str(h) for h in headers])
         for item in output:
-            writer.writerow([
-                six.ensure_str(x if x is not None else '') for x in item])
+            writer.writerow([ensure_str(i) for i in item])
         return result.getvalue()
 
     print('pw.format must be one of: table, simple, csv')

tests/test_utils.py

@@ -84,8 +84,8 @@ def test_echo_via_pager_env_default(mock_inner, mock_tabulate, mock_config):
 
 
 def _test_tabulate(fmt):
-    output = [(b'foo', 'bar', u'baz', '😀', None)]
-    headers = ('col1', 'colb', 'colIII', 'colX', 'colY')
+    output = [(b'foo', 'bar', u'baz', '😀', None, 1)]
+    headers = ('col1', 'colb', 'colIII', 'colX', 'colY', 'colZ')
 
     result = utils._tabulate(output, headers, fmt)
 
@@ -114,8 +114,8 @@ def test_tabulate_csv(mock_tabulate):
 
     mock_tabulate.assert_not_called()
     assert result == textwrap.dedent("""\
-        "col1","colb","colIII","colX","colY"
-        "foo","bar","baz","😀",""
+        "col1","colb","colIII","colX","colY","colZ"
+        "foo","bar","baz","😀","","1"
     """)