use wb on output

Author: alingse

jsoncsv/jsontool.py

@@ -163,5 +163,5 @@ def gen_objs_from_array():
             fout.write(content.encode('utf-8'))
             fout.write('\n'.encode('utf-8'))
         else:
-            fout.write(content)
-            fout.write('\n')
+            fout.write(content.encode('utf-8'))
+            fout.write(str('\n').encode('utf-8'))

jsoncsv/main.py

@@ -53,7 +53,7 @@ def separator_type(sep):
     default='-')
 @click.argument(
     'output',
-    type=click.File('w'),
+    type=click.File('wb'),
     default='-')
 def jsoncsv(output, input, expand, restore, safe, separator, json_array):
     if expand and restore:

tests/test_jsontool.py

@@ -6,7 +6,6 @@
 import io
 import unittest
 
-from jsoncsv import PY2
 from jsoncsv.jsontool import expand, restore
 from jsoncsv.jsontool import is_array_index
 from jsoncsv.jsontool import convert_json
@@ -106,42 +105,33 @@ class TestConvertJSON(unittest.TestCase):
 
     def test_convert_expand(self):
         fin = io.StringIO('{"a":{"b":3}}\n{"a":{"c":4}}\n')
-        if PY2:
-            fout = io.BytesIO()
-        else:
-            fout = io.StringIO()
+        fout = io.BytesIO()
 
         convert_json(fin, fout, expand)
 
-        self.assertEqual('{"a.b": 3}\n{"a.c": 4}\n', fout.getvalue())
+        self.assertEqual(b'{"a.b": 3}\n{"a.c": 4}\n', fout.getvalue())
 
         fin.close()
         fout.close()
 
     def test_convert_restore(self):
         fin = io.StringIO('{"a.b": 3}\n{"a.c": 4}\n')
-        if PY2:
-            fout = io.BytesIO()
-        else:
-            fout = io.StringIO()
+        fout = io.BytesIO()
 
         convert_json(fin, fout, restore)
 
-        self.assertEqual('{"a": {"b": 3}}\n{"a": {"c": 4}}\n', fout.getvalue())
+        self.assertEqual(b'{"a": {"b": 3}}\n{"a": {"c": 4}}\n', fout.getvalue())
 
         fin.close()
         fout.close()
 
     def test_convert_expand_json_array(self):
         fin = io.StringIO('[{"a":{"b":3}},{"a":{"c":4}}]')
-        if PY2:
-            fout = io.BytesIO()
-        else:
-            fout = io.StringIO()
+        fout = io.BytesIO()
 
         convert_json(fin, fout, expand, json_array=True)
 
-        self.assertEqual('{"a.b": 3}\n{"a.c": 4}\n', fout.getvalue())
+        self.assertEqual(b'{"a.b": 3}\n{"a.c": 4}\n', fout.getvalue())
 
         fin.close()
         fout.close()