Fix 0015

Drake-Z · Drake-Z · commit ea7642dfda34 · 2016-06-18T09:35:48.000+08:00
diff --git a/Drake-Z/0015/0015.py b/Drake-Z/0015/0015.py
@@ -11,36 +11,21 @@
 
 __author__ = 'Drake-Z'
 
-import os
-import re
+import json
 from collections import OrderedDict
-import xlwt
+from openpyxl import Workbook
+from openpyxl.styles import Font
 
-def read_data(data, re1, re2):
-    c = OrderedDict([])
-    re_xuhao = re.compile(r'%s' % re1)            
-    re_yuansu = re.compile(r'%s' % re2)            
-    a = re_xuhao.findall(data)                      #得到序号
-    b = re_yuansu.findall(data)                 #得到具体数据
-    for m, n in zip(a, b):                          #将数据转为Dict
-        n = re.split(r',', n)
-        c[m] = n
-    writeFlie(c, hangshu, lieshu)
+def txt_to_xlsx(filename):
+    file = open(filename, 'r', encoding = 'UTF-8')
+    file_cintent = json.load(file, encoding = 'UTF-8')
+    print(file_cintent)
+    workbook = Workbook()
+    worksheet = workbook.create_sheet(title = 'city')
+    for i in range(1, len(file_cintent)+1):
+        worksheet.cell(row = i, column = 1).value = i
+        worksheet.cell(row = i, column = 2).value = file_cintent[str(i)]
+    workbook.save(filename = 'city.xls')
 
-def writeFlie(dictdata, hangshu, lieshu):
-    workbook = xlwt.Workbook(encoding = 'utf-8')                #创建工作薄
-    worksheet = workbook.add_sheet('My Worksheet')              #创建表
-    num = list(dictdata.keys())                                                    #得到序号
-    for i in range(0, hangshu):
-        worksheet.write(i, 0, label = num[i])
-        for m in range(0, lieshu):
-            worksheet.write(i, m+1, label = dictdata[num[i]][m])
-    workbook.save('city.xls')
-    
 if __name__ == '__main__':
-    file = open('city.txt', 'r', encoding='utf-8')
-    hangshu = 3
-    lieshu = 1
-    re1 = '"(.*?)" :'
-    re2 = ': "(.*?)"'
-    read_data(file.read(), re1, re2)
+    txt_to_xlsx('city.txt')
