Merge pull request #38 from alingse/try-fix-windows

Try fix windows

Author: alingse

.travis.yml

@@ -3,7 +3,7 @@ cache: pip
 sudo: false
 python:
     - "2.7"
-    - "3.5"
+    # - "3.5"
     - "3.6"
     - "3.7"
 install:

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

@@ -1,7 +1,5 @@
 # coding=utf-8
-
 import click
-import sys
 
 from jsoncsv import jsontool
 from jsoncsv import dumptool
@@ -51,12 +49,12 @@ def separator_type(sep):
     help='expand json')
 @click.argument(
     'input',
-    type=click.File('r'),
-    default=sys.stdin)
+    type=click.File('r', encoding='utf-8'),
+    default='-')
 @click.argument(
     'output',
-    type=click.File('w'),
-    default=sys.stdout)
+    type=click.File('wb'),
+    default='-')
 def jsoncsv(output, input, expand, restore, safe, separator, json_array):
     if expand and restore:
         raise click.UsageError('can not choose both, default is `-e`')
@@ -94,16 +92,13 @@ def jsoncsv(output, input, expand, restore, safe, separator, json_array):
     help='enable sort the headers keys')
 @click.argument(
     'input',
-    type=click.File('r'),
-    default=sys.stdin)
+    type=click.File('r', encoding='utf-8'),
+    default='-')
 @click.argument(
     'output',
     type=click.File('wb'),
-    default=sys.stdout)
+    default='-')
 def mkexcel(output, input, sort_, row, type_):
-    if output == sys.stdout:
-        output = click.get_binary_stream('stdout')
-
     klass = dumptool.DumpCSV
     if type_ == "xls":
         klass = dumptool.DumpXLS

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='jsoncsv',
-    version='2.2.3',
+    version='2.2.4a',
     url='https://github.com/alingse/jsoncsv',
     description='A command tool easily convert json file to csv or xlsx.',
     long_description=readme,
@@ -26,7 +26,7 @@
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.5',
+        # 'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',
     ],

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
@@ -105,43 +104,45 @@ 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')
-        if PY2:
-            fout = io.BytesIO()
-        else:
-            fout = io.StringIO()
+        fin = io.BytesIO(u'{"a":{"b":3}}\n{"a":{"c":4}}\n'.encode('utf-8'))
+        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_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')
-        if PY2:
-            fout = io.BytesIO()
-        else:
-            fout = io.StringIO()
+        fin = io.BytesIO(u'{"a.b": 3}\n{"a.c": 4}\n'.encode('utf-8'))
+        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()
+        fin = io.BytesIO(u'[{"a":{"b":3}},{"a":{"c":4}}]'.encode('utf-8'))
+        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()

tests/test_mkexcel.py

@@ -3,6 +3,7 @@
 # 2018.03.29
 
 import unittest
+from io import open
 
 from jsoncsv.dumptool import DumpCSV
 from jsoncsv.dumptool import DumpXLS
@@ -13,39 +14,39 @@ class TestDumpTool(unittest.TestCase):
 
     # FIXME (使用虚拟文件)
     def test_dumpexcel_csv(self):
-        fin = open('./fixture/files/expand.1.json', 'r')
+        fin = open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
         fout = open('./fixture/files/tmp.output.1.csv', 'wb')
 
         dump_excel(fin, fout, DumpCSV)
         fin.close()
         fout.close()
 
-        output = open('./fixture/files/output.1.csv', 'r')
-        fout = open('./fixture/files/tmp.output.1.csv', 'r')
+        output = open('./fixture/files/output.1.csv', 'r', encoding='utf-8')
+        fout = open('./fixture/files/tmp.output.1.csv', 'r', encoding='utf-8')
 
         self.assertEqual(output.read(), fout.read())
 
         output.close()
         fout.close()
 
     def test_dumpexcel_csv_with_sort(self):
-        fin = open('./fixture/files/expand.1.json', 'r')
+        fin = open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
         fout = open('./fixture/files/tmp.output.1.sort.csv', 'wb')
 
         dump_excel(fin, fout, DumpCSV, sort_type=True)
         fin.close()
         fout.close()
 
-        output = open('./fixture/files/output.1.sort.csv', 'r')
-        fout = open('./fixture/files/tmp.output.1.sort.csv', 'r')
+        output = open('./fixture/files/output.1.sort.csv', 'r', encoding='utf-8')
+        fout = open('./fixture/files/tmp.output.1.sort.csv', 'r', encoding='utf-8')
 
         self.assertEqual(output.read(), fout.read())
 
         output.close()
         fout.close()
 
     def test_dumpcexcel_xls(self):
-        fin = open('./fixture/files/expand.1.json', 'r')
+        fin = open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
         fout = open('./fixture/files/tmp.output.1.xls', 'wb')
 
         dump_excel(fin, fout, DumpXLS)
@@ -54,7 +55,7 @@ def test_dumpcexcel_xls(self):
         fout.close()
 
     def test_dump_csv_with_non_ascii(self):
-        fin = open('./fixture/files/expand.2.json', 'r')
+        fin = open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
         fout = open('./fixture/files/tmp.output.2.csv', 'wb')
 
         dump_excel(fin, fout, DumpCSV)
@@ -63,7 +64,7 @@ def test_dump_csv_with_non_ascii(self):
         fout.close()
 
     def test_dump_xls_with_non_ascii(self):
-        fin = open('./fixture/files/expand.2.json', 'r')
+        fin = open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
         fout = open('./fixture/files/tmp.output.2.xls', 'wb')
 
         dump_excel(fin, fout, DumpXLS)