close one

Author: alingse

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)