use bytes

Author: alingse

jsoncsv/main.py

@@ -49,7 +49,7 @@ def separator_type(sep):
     help='expand json')
 @click.argument(
     'input',
-    type=click.File('r'),
+    type=click.File('r', encoding='utf-8'),
     default='-')
 @click.argument(
     'output',

tests/test_jsontool.py

@@ -104,7 +104,7 @@ def test_expand_and_restore(self):
 class TestConvertJSON(unittest.TestCase):
 
     def test_convert_expand(self):
-        fin = io.StringIO('{"a":{"b":3}}\n{"a":{"c":4}}\n')
+        fin = io.BytesIO(u'{"a":{"b":3}}\n{"a":{"c":4}}\n'.encode('utf-8'))
         fout = io.BytesIO()
 
         convert_json(fin, fout, expand)
@@ -114,8 +114,19 @@ def test_convert_expand(self):
         fin.close()
         fout.close()
 
+    def test_convert_with_unicode(self):
+        fin = io.BytesIO(u'{"河流":{"长度":3}}\n{"河流":{"名字":"长江"}}\n'.encode('utf-8'))
+        fout = io.BytesIO()
+
+        convert_json(fin, fout, expand)
+
+        self.assertEqual(u'{"河流.长度": 3}\n{"河流.名字": "长江"}\n'.encode('utf-8'), fout.getvalue())
+
+        fin.close()
+        fout.close()
+
     def test_convert_restore(self):
-        fin = io.StringIO('{"a.b": 3}\n{"a.c": 4}\n')
+        fin = io.BytesIO(u'{"a.b": 3}\n{"a.c": 4}\n'.encode('utf-8'))
         fout = io.BytesIO()
 
         convert_json(fin, fout, restore)
@@ -126,7 +137,7 @@ def test_convert_restore(self):
         fout.close()
 
     def test_convert_expand_json_array(self):
-        fin = io.StringIO('[{"a":{"b":3}},{"a":{"c":4}}]')
+        fin = io.BytesIO(u'[{"a":{"b":3}},{"a":{"c":4}}]'.encode('utf-8'))
         fout = io.BytesIO()
 
         convert_json(fin, fout, expand, json_array=True)