修复挑战 02 bug

jaggerwang · jaggerwang · commit 1ebfc8d802c2 · 2018-08-08T09:37:10.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,6 @@
-.DS_Store
+.*
+.*/
+
 venv/
 __pycache__/
 *.pyc
diff --git a/02-income-tax-calculator-enhancement/challenge2.py b/02-income-tax-calculator-enhancement/challenge2.py
@@ -50,6 +50,7 @@ def main():
             income = int(income_string)
         except ValueError:
             print('Parameter Error')
+            continue
         _, remain = calc_income_tax_and_remain(income)
         print('{}:{}'.format(employee_id, remain))
 
diff --git a/03-income-tax-calculator-use-config-file/challenge3.py b/03-income-tax-calculator-use-config-file/challenge3.py
@@ -26,6 +26,8 @@
 ]
 
 # 命令行参数处理类
+
+
 class Args(object):
 
     # 初始化的时候读取命令行中输入的所有参数到 self.args 列表
@@ -59,11 +61,14 @@ def userdata_path(self):
     def export_path(self):
         return self._value_after_option('-o')
 
+
 # 创建命令行参数处理的对象 args
 # 在此处创建的原因是后续的 class Config 的代码定义中需要用到这个对象
 args = Args()
 
 # 配置文件读取处理类
+
+
 class Config(object):
 
     # 初始化的时候调用内部接口 self._read_config() 读取配置文件中的所有内容
@@ -124,12 +129,15 @@ def social_insurance_total_rate(self):
             self._get_config('GongJiJin')
         ])
 
+
 # 创建配置文件处理的对象 config
 # 在此处创建的原因是后续的 class IncomeTaxCalculator
 # 的代码定义中需要用到这个对象
 config = Config()
 
 # 用户工资文件处理类
+
+
 class UserData(object):
 
     # 初始化过程，读取用户工资文件并将数据存入到 userdata 列表中
@@ -166,6 +174,8 @@ def __iter__(self):
         return iter(self.userdata)
 
 # 税后工资计算类
+
+
 class IncomeTaxCalculator(object):
 
     # 初始化的时候传入 UserData 对象，传进来后赋值给 self.userdata
@@ -218,7 +228,8 @@ def calc_for_all_userdata(self):
             # 初始化返回的数据结果，包含工号和税前工资
             data = [employee_id, income]
             # 计算需要缴纳的社保，注意需要保留两位小数
-            social_insurance_money = '{:.2f}'.format(self.calc_social_insurance_money(income))
+            social_insurance_money = '{:.2f}'.format(
+                self.calc_social_insurance_money(income))
             # 计算个税及税后工资，注意需要保留两位小数
             tax, remain = self.calc_income_tax_and_remain(income)
             # 将社保、个税及税后工资补充到返回的数据列表中
diff --git a/05-income-tax-calculator-use-modules/test.cfg b/05-income-tax-calculator-use-modules/test.cfg
@@ -0,0 +1,29 @@
+[DEFAULT]
+JiShuL = 2193.00
+JiShuH = 16446.00
+YangLao = 0.08
+YiLiao = 0.02
+ShiYe = 0.005
+GongShang = 0
+ShengYu = 0
+GongJiJin = 0.06
+
+[CHENGDU]
+JiShuL = 2193.00
+JiShuH = 16446.00
+YangLao = 0.08
+YiLiao = 0.02
+ShiYe = 0.005
+GongShang = 0
+ShengYu = 0
+GongJiJin = 0.06
+
+[BEIJING]
+JiShuL = 4251.00
+JiShuH = 21258.00
+YangLao = 0.08
+YiLiao = 0.02
+ShiYe = 0.002
+GongShang = 0
+ShengYu = 0
+GongJiJin = 0.12
diff --git a/05-income-tax-calculator-use-modules/user.csv b/05-income-tax-calculator-use-modules/user.csv
@@ -0,0 +1,3 @@
+101,3500
+203,5000
+309,15000

-Original file line number
+Diff line change
@@ @@ -1,4 +1,6 @@ @@
 -.DS_Store
 +.*
 +.*/
++
 venv/
 __pycache__/
 *.pyc
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+101,3500`
	`2`	`+203,5000`
	`3`	`+309,15000`