chore: Apply minor code quality revisions

src/pyhf/modifiers/__init__.py

@@ -146,7 +146,7 @@ def wrapper(cls):
     if not args:
         # called like @modifier(name='foo', constrained=False, pdf_type='normal', op_code='addition')
         return _modifier(name, constrained, pdf_type, op_code)
-    elif len(args) == 1:
+    if len(args) == 1:
         # called like @modifier
         if not callable(args[0]):
             raise ValueError('You must decorate a callable python object')
@@ -158,10 +158,9 @@ def wrapper(cls):
             op_code=op_code,
         )
         return args[0]
-    else:
-        raise ValueError(
-            f'@modifier must be called with only keyword arguments, @modifier(name=\'foo\'), or no arguments, @modifier; ({len(args):d} given)'
-        )
+    raise ValueError(
+        f'@modifier must be called with only keyword arguments, @modifier(name=\'foo\'), or no arguments, @modifier; ({len(args):d} given)'
+    )
 
 
 from .histosys import histosys, histosys_combined

src/pyhf/pdf.py

@@ -151,15 +151,15 @@ def _nominal_and_modifiers_from_spec(config, spec):
                 if mtype == 'histosys':
                     lo_data = thismod['data']['lo_data'] if thismod else nom
                     hi_data = thismod['data']['hi_data'] if thismod else nom
-                    maskval = True if thismod else False
+                    maskval = bool(thismod)
                     mega_mods[key][s]['data']['lo_data'] += lo_data
                     mega_mods[key][s]['data']['hi_data'] += hi_data
                     mega_mods[key][s]['data']['nom_data'] += nom
                     mega_mods[key][s]['data']['mask'] += [maskval] * len(
                         nom
                     )  # broadcasting
                 elif mtype == 'normsys':
-                    maskval = True if thismod else False
+                    maskval = bool(thismod)
                     lo_factor = thismod['data']['lo'] if thismod else 1.0
                     hi_factor = thismod['data']['hi'] if thismod else 1.0
                     mega_mods[key][s]['data']['nom_data'] += [1.0] * len(nom)
@@ -171,7 +171,7 @@ def _nominal_and_modifiers_from_spec(config, spec):
                         nom
                     )  # broadcasting
                 elif mtype in ['normfactor', 'shapefactor', 'lumi']:
-                    maskval = True if thismod else False
+                    maskval = bool(thismod)
                     mega_mods[key][s]['data']['mask'] += [maskval] * len(
                         nom
                     )  # broadcasting
@@ -180,7 +180,7 @@ def _nominal_and_modifiers_from_spec(config, spec):
                     if mtype == 'shapesys':
                         maskval = [(x > 0 and y > 0) for x, y in zip(uncrt, nom)]
                     else:
-                        maskval = [True if thismod else False] * len(nom)
+                        maskval = [bool(thismod)] * len(nom)
                     mega_mods[key][s]['data']['mask'] += maskval
                     mega_mods[key][s]['data']['uncrt'] += uncrt
                     mega_mods[key][s]['data']['nom_data'] += nom

src/pyhf/readxml.py

@@ -304,7 +304,7 @@ def dedupe_parameters(parameters):
     duplicates = {}
     for p in parameters:
         duplicates.setdefault(p['name'], []).append(p)
-    for parname in duplicates.keys():
+    for parname in duplicates:
         parameter_list = duplicates[parname]
         if len(parameter_list) == 1:
             continue