replaced loops with comprehension

bombard/bombardier.py

@@ -36,10 +36,10 @@ def apply_supply_dict(request: dict, supply: dict) -> dict:
     """
     Use supply to substitute all {name} in request strings.
     """
-    for name in request:
+    for name, value in request.items():
         if isinstance(request[name], dict):
             request[name] = apply_supply_dict(request[name], supply)
-        elif isinstance(request[name], str):
+        elif isinstance(value, str):
             request[name] = apply_supply(request[name], supply)
     return request
 
@@ -93,14 +93,14 @@ def get_headers(request: dict, body_is_json: bool) -> dict:
         }
         if 'headers' in request and isinstance(request['headers'], str):
             # if headers in request description just a string we know this should be some predefined code
-            for known in predefined:
+            for known, value in predefined.items():
                 if request['headers'].lower() == known:
-                    return predefined[known]
+                    return value
         result = {}
         for name, val in request.get('headers', {}).items():
-            for known in predefined:
+            for known, value in predefined.items():
                 if name.lower() == known:
-                    result.update(predefined[known])
+                    result.update(value)
                     break
             else:
                 result.update({name: val})

bombard/campaign_yaml.py

@@ -37,14 +37,11 @@ def __init__(self, stream):
         super(IncludesLoader, self).__init__(stream)
 
     @staticmethod
-    def wrap_in_yaml_document(msg: str) ->str:
+    def wrap_in_yaml_document(msg: str) -> str:
         """
         Converts multi-line msg to yaml document that we can insert into yaml
         """
-        result = []
-        for line in msg.split('\n'):
-            if SIGNATURE not in line:  # skip line that mocks globals
-                result.append(' '*4 + line)
+        result = [' '*4 + line for line in msg.split('\n') if SIGNATURE not in line]
         return '|\n' + '\n'.join(result)
 
     def include(self, node):

bombard/main.py

@@ -129,7 +129,7 @@ def campaign(args):
     campaign_file_name = get_campaign_file_name(args)
     if os.path.isdir(campaign_file_name):
         show_folder(campaign_file_name)
-    elif not os.path.isfile(campaign_file_name) and not args.init:
+    elif not (os.path.isfile(campaign_file_name) or args.init):
         print(red(f'\nCannot find campaign file "{args.file_name}"\n'))
     else:
         start_campaign(args, yaml.load(open(campaign_file_name, 'r')))

bombard/weaver_mill.py

@@ -67,7 +67,7 @@ def process(self):
 
     def stop(self):
         """ Stops all threads - send stop signal to queue and lock until they stop """
-        for _ in range(len(self.threads)):
+        for _ in self.threads:
             self.queue.put(None)
         for thread in self.threads:
             thread.join()

tests/test_campaign_check.py

@@ -8,6 +8,7 @@
 
 EMPTY_BOOK = {}
 
+
 class TestCampaignCheck(unittest.TestCase):
     def setUp(self):
         setup_logging(logging.DEBUG)