Skip to content

Commit 177302a

Browse files
committed
Fix 0018 0019
1 parent c11c4ad commit 177302a

File tree

2 files changed

+46
-54
lines changed

2 files changed

+46
-54
lines changed

Drake-Z/0018/0018.py

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,29 @@
1818

1919
__author__ = 'Drake-Z'
2020

21-
import os
22-
import xlrd
21+
import xlrd,codecs
22+
from lxml import etree
23+
from collections import OrderedDict
2324

24-
def xmlwrite(file, hangshu):
25-
L = []
26-
L.append(r'<?xml version="1.0" encoding="UTF-8"?>')
27-
L.append(r'<root>')
28-
L.append(r'<citys>')
29-
L.append(r'<!-- ')
30-
L.append(r' 城市信息')
31-
L.append(r'-->')
32-
L.append(r'{')
33-
data = xlrd.open_workbook(file)
25+
def read_xls(filename):
26+
data = xlrd.open_workbook(filename)
3427
table = data.sheets()[0]
35-
for i in range(0, hangshu):
36-
a = '"%s" : "%s",' % (table.cell(i, 0).value, table.cell(i, 1).value)
37-
L.append(r' %s' % a)
38-
L.append(r'}')
39-
L.append(r'</citys>')
40-
L.append(r'</root>')
41-
a = '\n'.join(L)
42-
f = open('city.xml', 'w')
43-
f.write(a)
44-
f.close()
45-
print(a)
46-
return 0
28+
c = OrderedDict()
29+
for i in range(table.nrows):
30+
c[table.cell(i,0).value] = table.row_values(i)[1:]
31+
return c
4732

48-
file = 'city.xls'
49-
hangshu = 3
50-
xmlwrite(file, hangshu)
33+
def save_xml(data):
34+
output = codecs.open('city.xml','w','utf-8')
35+
root = etree.Element('root')
36+
city_xml = etree.ElementTree(root)
37+
city = etree.SubElement(root, 'city')
38+
city.append(etree.Comment('城市信息'))
39+
city.text = str(data)
40+
output.write(etree.tounicode(city_xml.getroot()))
41+
output.close()
42+
43+
if __name__ == '__main__':
44+
file = 'city.xls'
45+
a = read_xls(file)
46+
save_xml(a)

Drake-Z/0019/0019.py

Lines changed: 23 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,29 @@
1919

2020
__author__ = 'Drake-Z'
2121

22-
import os
23-
import xlrd
22+
import xlrd,codecs
23+
from lxml import etree
24+
from collections import OrderedDict
2425

25-
def xmlwrite(file, hangshu):
26-
L = []
27-
L.append(r'<?xml version="1.0" encoding="UTF-8"?>')
28-
L.append(r'<root>')
29-
L.append(r'<numbers>')
30-
L.append(r'<!-- ')
31-
L.append(r' 数字信息')
32-
L.append(r'-->')
33-
L.append(r'[')
34-
data = xlrd.open_workbook(file)
26+
def read_xls(filename):
27+
data = xlrd.open_workbook(filename)
3528
table = data.sheets()[0]
36-
for i in range(0, hangshu):
37-
a = '[%s, %s, %s],' % (table.cell(i, 0).value, table.cell(i, 1).value, table.cell(i, 2).value)
38-
L.append(r' %s' % a)
39-
L.append(r']')
40-
L.append(r'</numbers>')
41-
L.append(r'</root>')
42-
a = '\n'.join(L)
43-
f = open('numbers.xml', 'w')
44-
f.write(a)
45-
f.close()
46-
print(a)
47-
return 0
29+
c = OrderedDict()
30+
for i in range(table.nrows):
31+
c[table.cell(i,0).value] = table.row_values(i)[1:]
32+
return c
4833

49-
file = 'numbers.xls'
50-
hangshu = 3
51-
xmlwrite(file, hangshu)
34+
def save_xml(data):
35+
output = codecs.open('numbers.xml','w','utf-8')
36+
root = etree.Element('root')
37+
numbers_xml = etree.ElementTree(root)
38+
numbers = etree.SubElement(root, 'numbers')
39+
numbers.append(etree.Comment('城市信息'))
40+
numbers.text = str(data)
41+
output.write(etree.tounicode(numbers_xml.getroot()))
42+
output.close()
43+
44+
if __name__ == '__main__':
45+
file = 'numbers.xls'
46+
a = read_xls(file)
47+
save_xml(a)

0 commit comments

Comments
 (0)