cn · huangjj27 · Feb 27, 2021 · Feb 27, 2021 · Feb 27, 2021 · Feb 27, 2021
diff --git a/mca/198012.tsv b/mca/198012.tsv
diff --git a/mca/198112.tsv b/mca/198112.tsv
diff --git a/mca/198212.tsv b/mca/198212.tsv
diff --git a/mca/198312.tsv b/mca/198312.tsv
diff --git a/mca/198412.tsv b/mca/198412.tsv
diff --git a/mca/198512.tsv b/mca/198512.tsv
diff --git a/mca/198612.tsv b/mca/198612.tsv
diff --git a/mca/198712.tsv b/mca/198712.tsv
diff --git a/mca/198812.tsv b/mca/198812.tsv
diff --git a/mca/198912.tsv b/mca/198912.tsv
diff --git a/mca/199012.tsv b/mca/199012.tsv
diff --git a/mca/199112.tsv b/mca/199112.tsv
diff --git a/mca/199212.tsv b/mca/199212.tsv
diff --git a/mca/199312.tsv b/mca/199312.tsv
diff --git a/mca/199412.tsv b/mca/199412.tsv
diff --git a/mca/199512.tsv b/mca/199512.tsv
diff --git a/mca/199612.tsv b/mca/199612.tsv
diff --git a/mca/199712.tsv b/mca/199712.tsv
diff --git a/mca/199812.tsv b/mca/199812.tsv
diff --git a/mca/199912.tsv b/mca/199912.tsv
diff --git a/mca/200012.tsv b/mca/200012.tsv
diff --git a/mca/200112.tsv b/mca/200112.tsv
diff --git a/mca/200212.tsv b/mca/200212.tsv
diff --git a/mca/200312.tsv b/mca/200312.tsv
diff --git a/mca/200412.tsv b/mca/200412.tsv
diff --git a/mca/200512.tsv b/mca/200512.tsv
diff --git a/mca/200612.tsv b/mca/200612.tsv
diff --git a/mca/200712.tsv b/mca/200712.tsv
diff --git a/mca/200812.tsv b/mca/200812.tsv
diff --git a/mca/200912.tsv b/mca/200912.tsv
diff --git a/mca/201012.tsv b/mca/201012.tsv
diff --git a/mca/201112.tsv b/mca/201112.tsv
diff --git a/mca/201212.tsv b/mca/201212.tsv
diff --git a/mca/201312.tsv b/mca/201312.tsv
diff --git a/mca/201412.tsv b/mca/201412.tsv
diff --git a/mca/201501.tsv b/mca/201501.tsv
diff --git a/mca/201502.tsv b/mca/201502.tsv
diff --git a/mca/201503.tsv b/mca/201503.tsv
diff --git a/mca/201504.tsv b/mca/201504.tsv
diff --git a/mca/201505.tsv b/mca/201505.tsv
diff --git a/mca/201506.tsv b/mca/201506.tsv
diff --git a/mca/201507.tsv b/mca/201507.tsv
diff --git a/mca/201508.tsv b/mca/201508.tsv
diff --git a/mca/201509.tsv b/mca/201509.tsv
diff --git a/mca/201510.tsv b/mca/201510.tsv
diff --git a/mca/201511.tsv b/mca/201511.tsv
diff --git a/mca/201512.tsv b/mca/201512.tsv
diff --git a/mca/201601.tsv b/mca/201601.tsv
diff --git a/mca/201602.tsv b/mca/201602.tsv
diff --git a/mca/201603.tsv b/mca/201603.tsv
diff --git a/mca/201604.tsv b/mca/201604.tsv
diff --git a/mca/201605.tsv b/mca/201605.tsv
diff --git a/mca/201606.tsv b/mca/201606.tsv
diff --git a/mca/201607.tsv b/mca/201607.tsv
diff --git a/mca/201608.tsv b/mca/201608.tsv
diff --git a/mca/201609.tsv b/mca/201609.tsv
diff --git a/mca/201610.tsv b/mca/201610.tsv
diff --git a/mca/201611.tsv b/mca/201611.tsv
diff --git a/mca/201612.tsv b/mca/201612.tsv
diff --git a/mca/201701.tsv b/mca/201701.tsv
diff --git a/mca/201702.tsv b/mca/201702.tsv
diff --git a/mca/201703.tsv b/mca/201703.tsv
diff --git a/mca/201704.tsv b/mca/201704.tsv
diff --git a/mca/201705.tsv b/mca/201705.tsv
diff --git a/mca/201706.tsv b/mca/201706.tsv
diff --git a/mca/201707.tsv b/mca/201707.tsv
diff --git a/mca/201708.tsv b/mca/201708.tsv
diff --git a/mca/201709.tsv b/mca/201709.tsv
diff --git a/mca/201710.tsv b/mca/201710.tsv
diff --git a/mca/201711.tsv b/mca/201711.tsv
diff --git a/mca/201712.tsv b/mca/201712.tsv
diff --git a/mca/201801.tsv b/mca/201801.tsv
diff --git a/mca/201812.tsv b/mca/201812.tsv
diff --git a/mca/201904.tsv b/mca/201904.tsv
diff --git a/mca/201912.tsv b/mca/201912.tsv
diff --git a/mca/202011.tsv b/mca/202011.tsv
diff --git a/mca/202012.tsv b/mca/202012.tsv
diff --git a/mca/202112.tsv b/mca/202112.tsv
diff --git a/scripts/parse.py b/scripts/parse.py
@@ -28,8 +28,8 @@
 def strip_spaces_in_chinese_words(line):
     cjk_chars = u'\u3007\u4e00-\u9fff\u3400-\u4dbf\uf900-\ufaff'
     return re.sub(
-        ur'(\d{6})(\s+)([%s]+)\s([%s]+)' % (cjk_chars, cjk_chars),
-        ur'\1\2\3\4', line, flags=re.U)
+        r'(\d{6})(\s+)([%s]+)\s([%s]+)' % (cjk_chars, cjk_chars),
+        r'\1\2\3\4', line, flags=re.U)
 
 
 def strip_comments(line):
@@ -120,7 +120,7 @@ def main():
             os.makedirs(dirname)
 
         with open(pathname, 'w') as dest_file:
-            print(b'Source\tRevision\tCode\tName', file=dest_file)
+            print('Source\tRevision\tCode\tName', file=dest_file)
             for line in iter_lines(el, schema):
                 text = strip_spaces_in_chinese_words(strip_comments(line))
                 if not text:
@@ -135,7 +135,7 @@ def main():
                     print('ignored: %s' % text, file=sys.stderr)
                 else:
                     out = '%s\t%s\t%s\t%s' % (source, revision, code, name)
-                    print(out.encode('utf-8'), file=dest_file)
+                    print(out, file=dest_file)
 
 
 if __name__ == '__main__':

diff --git a/sources.tsv b/sources.tsv
@@ -1,5 +1,9 @@
 Source	Revision	URL	Schema
+mca	202012	http://www.mca.gov.cn/article/sj/xzqh/2020/20201201.html	mca
+mca	202011	http://www.mca.gov.cn/article/sj/xzqh/2020/2020/202101041104.html	mca
+mca	201912	http://www.mca.gov.cn/article/sj/xzqh/1980/2019/202002281436.html	mca
 mca	201904	http://www.mca.gov.cn/article/sj/xzqh/2019/201901-06/201905271445.html	mca
+mca	201812	http://www.mca.gov.cn/article/sj/xzqh/1980/201903/201903011447.html	mca
 mca	201801	http://www.mca.gov.cn/article/sj/tjbz/a/2018/201803/201803191002.html	mca
 mca	201712	http://www.mca.gov.cn/article/sj/tjbz/a/2018/201803131439.html	mca
 mca	201711	http://www.mca.gov.cn/article/sj/tjbz/a/2017/201801/201801151447.html	mca
@@ -23,72 +27,38 @@ mca	201606	http://www.mca.gov.cn/article/sj/tjbz/a/2016/20161013/201610131044.ht
 mca	201605	http://www.mca.gov.cn/article/sj/tjbz/a/2016/201605/20160506281034.html	mca
 mca	201604	http://www.mca.gov.cn/article/sj/tjbz/a/2016/20160406/20160406031553.html	mca
 mca	201603	http://www.mca.gov.cn/article/sj/tjbz/a/2016/201603/201604281751.html	mca
-mca	201602	http://files2.mca.gov.cn/www/201603/20160321153519524.htm	mca
 mca	201601	http://www.mca.gov.cn/article/sj/tjbz/a/2015/up/201603/20160300881353.htm	mca
 mca	201512	http://www.mca.gov.cn/article/sj/tjbz/a/2015/up/201602/20160200880229.htm	mca
-mca	201511	http://files2.mca.gov.cn/www/201512/20151224151630189.htm	mca
-mca	201510	http://files2.mca.gov.cn/www/201511/20151127101349186.htm	mca
-mca	201509	http://files2.mca.gov.cn/www/201510/20151027164514222.htm	mca
-mca	201508	http://files2.mca.gov.cn/www/201509/20150923163050122.htm	mca
-mca	201507	http://files2.mca.gov.cn/www/201509/20150923163536438.htm	mca
-mca	201506	http://files2.mca.gov.cn/www/201509/20150923165323491.htm	mca
-mca	201505	http://files2.mca.gov.cn/www/201509/20150923165551456.htm	mca
-mca	201504	http://files2.mca.gov.cn/www/201509/20150923165725386.htm	mca
-mca	201503	http://files2.mca.gov.cn/cws/201505/20150505105354985.htm	mca
-mca	201502	http://files2.mca.gov.cn/www/201509/20150923165847466.htm	mca
-mca	201501	http://files2.mca.gov.cn/www/201509/20150923165951249.htm	mca
-mca	201412	http://files2.mca.gov.cn/cws/201502/20150225163817214.html	mca
-mca	201312	http://files2.mca.gov.cn/cws/201404/20140404125552372.htm	mca
-mca	201112	http://files2.mca.gov.cn/cws/201308/20130821143408921.htm	mca
-mca	201012	http://files2.mca.gov.cn/cws/201502/20150225155630452.htm	mca
-mca	200912	http://files2.mca.gov.cn/cws/201502/20150225155548374.htm	mca
-mca	200812	http://files2.mca.gov.cn/cws/201502/20150225155505816.htm	mca
-mca	200712	http://files2.mca.gov.cn/cws/201502/20150225155431443.htm	mca
-mca	200612	http://files2.mca.gov.cn/cws/201502/20150225155349475.htm	mca
-mca	200512	http://files2.mca.gov.cn/cws/201502/20150225155305906.htm	mca
-mca	200412	http://files2.mca.gov.cn/cws/201502/20150225155213857.htm	mca
-mca	200312	http://files2.mca.gov.cn/cws/201502/20150225154652784.htm	mca
-mca	200212	http://files2.mca.gov.cn/cws/201502/20150225154605585.htm	mca
-mca	200112	http://files2.mca.gov.cn/cws/201502/20150225154526456.htm	mca
-mca	200012	http://files2.mca.gov.cn/cws/201502/20150225154437380.htm	mca
-mca	199912	http://files2.mca.gov.cn/www/201512/20151203095009488.htm	mca
-mca	199812	http://files2.mca.gov.cn/www/201512/20151203094942775.htm	mca
-mca	199712	http://files2.mca.gov.cn/www/201512/20151203094913384.htm	mca
-mca	199612	http://files2.mca.gov.cn/www/201512/2015120309482673.htm	mca
-mca	199512	http://files2.mca.gov.cn/www/201512/20151203094730991.htm	mca
-mca	199412	http://files2.mca.gov.cn/www/201512/2015120309464500.htm	mca
-mca	199312	http://files2.mca.gov.cn/www/201512/20151203094621380.htm	mca
-mca	199212	http://files2.mca.gov.cn/www/201512/20151203094552341.htm	mca
-mca	199112	http://files2.mca.gov.cn/www/201512/20151203094523451.htm	mca
-mca	199012	http://files2.mca.gov.cn/www/201512/20151203094456319.htm	mca
-mca	198912	http://files2.mca.gov.cn/www/201512/20151203094426140.htm	mca
-mca	198812	http://files2.mca.gov.cn/www/201512/20151203094353258.htm	mca
-mca	198712	http://files2.mca.gov.cn/www/201512/20151203094326909.htm	mca
-mca	198612	http://files2.mca.gov.cn/www/201512/20151203094259720.htm	mca
-mca	198512	http://files2.mca.gov.cn/www/201512/20151203094227472.htm	mca
-mca	198412	http://files2.mca.gov.cn/www/201512/20151203094046186.htm	mca
-mca	198312	http://files2.mca.gov.cn/www/201512/20151203093948255.htm	mca
-mca	198212	http://files2.mca.gov.cn/www/201512/20151203093700735.htm	mca
-mca	198112	http://files2.mca.gov.cn/www/201512/20151203093558121.htm	mca
-mca	198012	http://files2.mca.gov.cn/www/201512/20151202154257477.htm	mca
-stats	201810	http://www.stats.gov.cn/tjsj/tjbz/tjyqhdmhcxhfdm/2018/index.html	stats
-stats	201607	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201703/t20170310_1471429.html	stats
-stats	201509	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201608/t20160809_1386477.html	stats
-stats	201410	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201504/t20150415_712722.html	stats
-stats	201308	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201401/t20140116_501070.html	stats
-stats	201210	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201301/t20130118_38316.html	stats
-stats	201110	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201201/t20120105_38315.html	stats
-stats	201010	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201107/t20110726_38314.html	stats
-stats	200912	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/201006/t20100623_38313.html	stats
-stats	200812	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200906/t20090626_38312.html	stats
-stats	200712	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200802/t20080215_38311.html	stats
-stats	200612	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200704/t20070411_38310.html	stats
-stats	200512	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200410/t20041022_38307.html	stats-mass
-stats	200506	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200410/t20041022_38306.html	stats-mass
-stats	200412	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200410/t20041022_38305.html	stats-mass
-stats	200409	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200410/t20041022_38304.html	stats-mass
-stats	200403	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200406/t20040607_38302.html	stats-mass
-stats	200312	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200402/t20040211_38301.html	stats-mass
-stats	200306	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200307/t20030722_38300.html	stats-mass
-stats	200212	http://www.stats.gov.cn/tjsj/tjbz/xzqhdm/200302/t20030219_38299.html	stats-mass
-
+mca	201212	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201707271556.html	mca
+mca	201112	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201707271552.html	mca
+mca	201012	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220946.html	mca
+mca	200912	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220943.html	mca
+mca	200812	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220941.html	mca
+mca	200712	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220939.html	mca
+mca	200612	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220936.html	mca
+mca	200512	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220935.html	mca
+mca	200412	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220930.html	mca
+mca	200312	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220928.html	mca
+mca	200212	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220927.html	mca
+mca	200112	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220925.html	mca
+mca	200012	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220923.html	mca
+mca	199912	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220921.html	mca
+mca	199812	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220918.html	mca
+mca	199712	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220916.html	mca
+mca	199612	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220914.html	mca
+mca	199512	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220913.html	mca
+mca	199412	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220911.html	mca
+mca	199312	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708041023.html	mca
+mca	199212	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220910.html	mca
+mca	199112	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708041020.html	mca
+mca	199012	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708041018.html	mca
+mca	198912	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708041017.html	mca
+mca	198812	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220903.html	mca
+mca	198712	http://www.mca.gov.cn/article/sj/xzqh/1980/1980/201911180950.html	mca
+mca	198612	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220859.html	mca
+mca	198512	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220858.html	mca
+mca	198412	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708220856.html	mca
+mca	198312	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708160821.html	mca
+mca	198212	http://www.mca.gov.cn/article/sj/xzqh/1980/1980/201911180942.html	mca
+mca	198112	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708041004.html	mca
+mca	198012	http://www.mca.gov.cn/article/sj/tjbz/a/201713/201708040959.html	mca