Merge pull request #40 from alingse/use-io-textwraper

Use io textwraper

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

@@ -135,6 +135,10 @@ def restore(expobj, separator='.', safe=False):
 
 
 def convert_json(fin, fout, func, separator=".", safe=False, json_array=False):
+    '''
+    ensure fin/fout is TextIO
+    '''
+
     if func not in [expand, restore]:
         raise ValueError("unknow convert_json type")
 
@@ -159,9 +163,5 @@ def gen_objs_from_array():
     for obj in objs:
         new = func(obj, separator=separator, safe=safe)
         content = json.dumps(new, ensure_ascii=False)
-        if PY2:
-            fout.write(content.encode('utf-8'))
-            fout.write('\n'.encode('utf-8'))
-        else:
-            fout.write(content.encode('utf-8'))
-            fout.write(str('\n').encode('utf-8'))
+        fout.write(content)
+        fout.write('\n')

jsoncsv/main.py

@@ -10,9 +10,13 @@
 
 def separator_type(sep):
     if len(sep) != 1:
-        raise click.BadOptionUsage('separator can only be a char')
+        raise click.BadOptionUsage(
+            option_name='separator',
+            message='separator can only be a char')
     if sep == unit_char:
-        raise click.BadOptionUsage('separator can not be `\\` ')
+        raise click.BadOptionUsage(
+            option_name='separator',
+            message='separator can not be `\\` ')
     return sep
 
 
@@ -46,21 +50,22 @@ def separator_type(sep):
     '--expand',
     'expand',
     is_flag=True,
-    help='expand json')
+    help='expand json (default True)')
 @click.argument(
     'input',
     type=click.File('r', encoding='utf-8'),
     default='-')
 @click.argument(
     'output',
-    type=click.File('wb'),
+    type=click.File('w', encoding='utf-8'),
     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`')
 
-    func = jsontool.expand
-    if restore:
+    if not restore:
+        func = jsontool.expand
+    else:
         func = jsontool.restore
 
     convert_json(input, output, func, separator=separator, safe=safe, json_array=json_array)

setup.py

@@ -12,7 +12,7 @@
 
 setup(
     name='jsoncsv',
-    version='2.2.4a',
+    version='2.2.4',
     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',
     ],
@@ -42,13 +42,10 @@
         ],
     },
     keywords=[
+        'jsoncsv',
         'jsontocsv',
         'json2csv',
-        'jsoncsv',
-        'command',
         'convert',
-        'json',
-        'csv',
-        'xls',
+        'json2xls',
     ],
 )

tests/test_mkexcel.py tests/test_dumptool.pytests/test_mkexcel.py renamed to tests/test_dumptool.py

@@ -1,9 +1,8 @@
 # coding=utf-8
 # author@alingse
 # 2018.03.29
-
+import io
 import unittest
-from io import open
 
 from jsoncsv.dumptool import DumpCSV
 from jsoncsv.dumptool import DumpXLS
@@ -14,58 +13,58 @@ class TestDumpTool(unittest.TestCase):
 
     # FIXME (使用虚拟文件)
     def test_dumpexcel_csv(self):
-        fin = open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.1.csv', 'wb')
+        fin = io.open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
+        fout = io.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', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.1.csv', 'r', encoding='utf-8')
+        output = io.open('./fixture/files/output.1.csv', 'r', encoding='utf-8')
+        fout = io.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', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.1.sort.csv', 'wb')
+        fin = io.open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
+        fout = io.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', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.1.sort.csv', 'r', encoding='utf-8')
+        output = io.open('./fixture/files/output.1.sort.csv', 'r', encoding='utf-8')
+        fout = io.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', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.1.xls', 'wb')
+        fin = io.open('./fixture/files/expand.1.json', 'r', encoding='utf-8')
+        fout = io.open('./fixture/files/tmp.output.1.xls', 'wb')
 
         dump_excel(fin, fout, DumpXLS)
 
         fin.close()
         fout.close()
 
     def test_dump_csv_with_non_ascii(self):
-        fin = open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.2.csv', 'wb')
+        fin = io.open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
+        fout = io.open('./fixture/files/tmp.output.2.csv', 'wb')
 
         dump_excel(fin, fout, DumpCSV)
 
         fin.close()
         fout.close()
 
     def test_dump_xls_with_non_ascii(self):
-        fin = open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
-        fout = open('./fixture/files/tmp.output.2.xls', 'wb')
+        fin = io.open('./fixture/files/expand.2.json', 'r', encoding='utf-8')
+        fout = io.open('./fixture/files/tmp.output.2.xls', 'wb')
 
         dump_excel(fin, fout, DumpXLS)
 

tests/test_jsoncsv.py

@@ -10,24 +10,29 @@
 
 
 class Testjsoncsv(unittest.TestCase):
-
     def test_jsoncsv_expand(self):
         runner = CliRunner()
-        args = ['-e', 'fixture/files/raw.0.json', 'fixture/files/tmp.expand.0.json']
+        args = ['-e', 'fixture/files/raw.0.json',
+                'fixture/files/tmp.expand.0.json']
         result = runner.invoke(jsoncsv, args=args)
         assert result.exit_code == 0
 
     def test_jsoncsv_expand_with_json_array(self):
         runner = CliRunner()
-        args = ['-e', 'fixture/files/raw.1.json', 'fixture/files/tmp.expand.1.json', '-A']
+        args = ['-e', 'fixture/files/raw.1.json',
+                'fixture/files/tmp.expand.1.json', '-A']
         result = runner.invoke(jsoncsv, args=args)
         assert result.exit_code == 0
 
     def test_jsoncsv_expand_restore(self):
         runner = CliRunner(echo_stdin=True)
-        result = runner.invoke(jsoncsv, args=['-e', 'fixture/files/raw.2.json', 'fixture/files/tmp.expand.2.json'])
+        result = runner.invoke(jsoncsv,
+                               args=['-e', 'fixture/files/raw.2.json',
+                                     'fixture/files/tmp.expand.2.json'])
         assert result.exit_code == 0
-        result = runner.invoke(jsoncsv, args=['-r', 'fixture/files/tmp.expand.2.json', 'fixture/files/tmp.restore.2.json'])
+        result = runner.invoke(jsoncsv,
+                               args=['-r', 'fixture/files/tmp.expand.2.json',
+                                     'fixture/files/tmp.restore.2.json'])
         assert result.exit_code == 0
 
         with io.open('fixture/files/raw.2.json', 'r') as f:
@@ -37,3 +42,17 @@ def test_jsoncsv_expand_restore(self):
             resotre_data = [json.loads(line) for line in f]
 
         self.assertEqual(input_data, resotre_data)
+
+    def test_jsoncsv_with_error_args(self):
+        runner = CliRunner()
+        args = ['-s', 'aa', '-e', 'fixture/files/raw.0.json',
+                'fixture/files/tmp.expand.0.json']
+        result = runner.invoke(jsoncsv, args=args)
+        assert result.exit_code != 0
+
+    def test_jsoncsv_with_error_args_expand_and_restore(self):
+        runner = CliRunner()
+        args = ['-r', '-e', 'fixture/files/raw.0.json',
+                'fixture/files/tmp.expand.0.json']
+        result = runner.invoke(jsoncsv, args=args)
+        assert result.exit_code != 0

tests/test_jsontool.py

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