Fix pylint R1703 and R1705 warnings

taxcalc/calculator.py

@@ -286,8 +286,7 @@ def policy_param(self, param_name, param_value=None):
             val = getattr(self.__policy, param_name)
             if param_name.startswith("_"):
                 return val
-            else:
-                return val[0]  # drop down a dimension.
+            return val[0]  # drop down a dimension.
         setattr(self.__policy, param_name, param_value)
         return None
 

taxcalc/parameters.py

@@ -491,8 +491,7 @@ def get_index_rate(self, param, label_to_extend_val):
             self.set_rates()
         if param in self._wage_indexed:
             return self.wage_growth_rates(year=label_to_extend_val)
-        else:
-            return self.inflation_rates(year=label_to_extend_val)
+        return self.inflation_rates(year=label_to_extend_val)
 
     def set_rates(self):
         """
@@ -774,8 +773,7 @@ def __getattr__(self, attr):
             return self.to_array(
                 attr[1:], year=list(range(self.start_year, self.end_year + 1))
             )
-        else:
-            raise AttributeError(f"{attr} is not defined.")
+        raise AttributeError(f"{attr} is not defined.")
 
 
 TaxcalcReform = Union[str, Mapping[int, Any]]
@@ -815,7 +813,6 @@ def is_paramtools_format(params: Union[TaxcalcReform, ParamToolsAdjustment]):
     for data in params.values():
         if isinstance(data, dict):
             return False  # taxcalc reform
-        else:
-            # Not doing a specific check to see if the value is a list
-            # since it could be a list or just a scalar value.
-            return True
+        # Not doing a specific check to see if the value is a list
+        # since it could be a list or just a scalar value.
+        return True

taxcalc/tests/test_compare.py

@@ -264,12 +264,11 @@ def isfloat(value):
                 if abs(float(tok1) - float(tok2)) <= smallamt:
                     continue
                 return True
-            elif not tok1_isfloat and not tok2_isfloat:
+            if not tok1_isfloat and not tok2_isfloat:
                 if tok1 == tok2:
                     continue
                 return True
-            else:
-                return True
+            return True
         return False
 
 

taxcalc/tests/test_cpscsv.py

@@ -154,12 +154,11 @@ def isfloat(value):
                 if abs(float(tok1) - float(tok2)) <= smallamt:
                     continue
                 return True
-            elif not tok1_isfloat and not tok2_isfloat:
+            if not tok1_isfloat and not tok2_isfloat:
                 if tok1 == tok2:
                     continue
                 return True
-            else:
-                return True
+            return True
         return False
 
 

taxcalc/tests/test_growdiff.py

@@ -86,11 +86,7 @@ def test_boolean_value_infomation(tests_path):
             val = val[0]
             if isinstance(val, list):
                 val = val[0]
-        valstr = str(val)
-        if valstr in ('True', 'False'):
-            val_is_boolean = True
-        else:
-            val_is_boolean = False
+        val_is_boolean = str(val) in ('True', 'False')
         type_is_boolean = gdd[param]['type'] == 'bool'
         if val_is_boolean and not type_is_boolean:
             print('param,value_type,val,val_is_boolean=',

taxcalc/tests/test_pufcsv.py

@@ -179,12 +179,11 @@ def isfloat(value):
                 if abs(float(tok1) - float(tok2)) <= smallamt:
                     continue
                 return True
-            elif not tok1_isfloat and not tok2_isfloat:
+            if not tok1_isfloat and not tok2_isfloat:
                 if tok1 == tok2:
                     continue
                 return True
-            else:
-                return True
+            return True
         return False