STY: flake8 fixes everywhere

Author: Sebastian Wagner

contrib/eventdb/apply_mapping_eventdb.py

@@ -55,9 +55,9 @@ def eventdb_apply(malware_name_column, malware_family_column, host, port,
 
     cur.execute('SELECT DISTINCT "classification.identifier", "malware.name" FROM {table} '
                 'WHERE "classification.taxonomy" = \'malicious code\' {where}'
-            ''.format(table=table, where=where))
+                ''.format(table=table, where=where))
     if dry_run:
-        execute = lambda x, y: print(cur.mogrify(x, y).decode())
+        execute = lambda x, y: print(cur.mogrify(x, y).decode())  # noqa: E731
     else:
         execute = cur.execute
     for (identifier, malware_name) in cur.fetchall():
@@ -76,7 +76,7 @@ def eventdb_apply(malware_name_column, malware_family_column, host, port,
                         'AND "classification.identifier" IS DISTINCT FROM %s AND '
                         '"classification.taxonomy" = \'malicious code\' {where}'
                         ''.format(table=table, where=where),
-                        (rule[1],  malware_name, rule[1]))
+                        (rule[1], malware_name, rule[1]))
                 break
         else:
             print('missing mapping for', repr(malware_name))

contrib/malware_name_mapping/download_mapping.py

@@ -19,9 +19,9 @@
 URL_MALPEDIA = 'https://raw.githubusercontent.com/certtools/malware_name_mapping/master/malpedia.csv'
 URL_MISP = 'https://raw.githubusercontent.com/MISP/misp-galaxy/main/clusters/threat-actor.json'
 
-REGEX_FROM_HUMAN = re.compile(r"((?P<res1>[a-z])(?=[A-Z])|"  #  "fooBar"
-                               r"(?P<res2>.)(\\ )(?=[^\]])|"  #  "foo bar" but not "foo[-_ ]?bar"
-                               r"(?P<res3>[^\[-])\\-(?=[^-]))")  #  "foo-bar" but not "foo[-_ ]?bar"
+REGEX_FROM_HUMAN = re.compile(r"((?P<res1>[a-z])(?=[A-Z])|"  # "fooBar"
+                              r"(?P<res2>.)(\\ )(?=[^\]])|"  # "foo bar" but not "foo[-_ ]?bar"
+                              r"(?P<res3>[^\[-])\\-(?=[^-]))")  # "foo-bar" but not "foo[-_ ]?bar"
 IDENTIFIER_FROM_HUMAN = re.compile(r"[^a-z0-9]+")
 
 
@@ -75,7 +75,7 @@ def generate_regex_from_human(*values):
     return "^(%s)$" % "|".join(newvalues)
 
 
-def download(url: str=URL, add_default=False, params=None, include_malpedia=False,
+def download(url: str = URL, add_default=False, params=None, include_malpedia=False,
              include_misp=False, mwnmp_ignore_adware=False):
     download = requests.get(url)
     download.raise_for_status()
@@ -96,7 +96,7 @@ def download(url: str=URL, add_default=False, params=None, include_malpedia=Fals
             names = [actor["value"]] + actor.get("meta", {}).get("synonyms", [])
             identifier = ("%s-generic"
                           "" % IDENTIFIER_FROM_HUMAN.sub("-",
-                                                        actor["value"].lower()))
+                                                         actor["value"].lower()))
             rule_name = "misp-threat-actors-%s" % identifier
 
             rules.append(generate_rule(generate_regex_from_human(*names),

contrib/malware_name_mapping/test_download_mapping.py

@@ -69,7 +69,7 @@ def test_download_add_default_constant(self):
                            'then': {'classification.identifier': 'constant'}}]
                          )
 
-    maxDiff=None
+    maxDiff = None
 
 
 class TestParser(unittest.TestCase):

contrib/systemd/systemd.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+# flake8: noqa
 import collections
 import grp
 import json

intelmq/__init__.py

@@ -1,4 +1,4 @@
-from .version import __version__, __version_info__
+from .version import __version__, __version_info__  # noqa: F401
 import os
 
 

intelmq/bin/intelmqctl.py

@@ -23,7 +23,7 @@
 import pkg_resources
 from termstyle import green
 
-from intelmq import (BOTS_FILE, DEFAULT_LOGGING_LEVEL, DEFAULTS_CONF_FILE,
+from intelmq import (BOTS_FILE, DEFAULT_LOGGING_LEVEL, DEFAULTS_CONF_FILE,  # noqa: F401
                      HARMONIZATION_CONF_FILE, PIPELINE_CONF_FILE,
                      RUNTIME_CONF_FILE, VAR_RUN_PATH, STATE_FILE_PATH,
                      DEFAULT_LOGGING_PATH, __version_info__,

intelmq/bots/collectors/github_api/collector_github_api.py

@@ -48,7 +48,7 @@ def github_api(self, api_path: str, **kwargs) -> dict:
                 raise ValueError(response.json()['message'])
             else:
                 return response.json()
-        except requests.RequestException as e:
+        except requests.RequestException:
             raise ValueError("Unknown repository {!r}.".format(api_path))
 
     @staticmethod

intelmq/bots/collectors/github_api/collector_github_contents_api.py

@@ -30,7 +30,7 @@ def init(self):
         if hasattr(self.parameters, 'regex'):
             try:
                 re.compile(getattr(self.parameters, 'regex'))
-            except Exception as e:
+            except Exception:
                 raise InvalidArgument('regex', expected='string', got=getattr(self.parameters, 'regex'))
         else:
             raise InvalidArgument('regex', expected='string', got=None)

intelmq/lib/test.py

@@ -415,7 +415,7 @@ def assertLoglineEqual(self, line_no: int, message: str, levelname: str = "ERROR
         fields = utils.parse_logline(logline)
 
         self.assertEqual(self.bot_id, fields["bot_id"],
-                         "bot_id %s didn't match %s"
+                         "bot_id {!r} didn't match {!r}."
                          "".format(self.bot_id, fields["bot_id"]))
 
         self.assertEqual(levelname, fields["log_level"])
@@ -436,7 +436,7 @@ def assertLoglineMatches(self, line_no: int, pattern: str, levelname: str = "ERR
         fields = utils.parse_logline(logline)
 
         self.assertEqual(self.bot_id, fields["bot_id"],
-                         "bot_id %s didn't match %s"
+                         "bot_id {!r} didn't match {!r}."
                          "".format(self.bot_id, fields["bot_id"]))
 
         self.assertEqual(levelname, fields["log_level"])

setup.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 import json
 import os
-import sys
 
 from setuptools import find_packages, setup
 
@@ -31,7 +30,7 @@
 
 setup(
     name='intelmq',
-    version=__version__,
+    version=__version__,  # noqa: F821
     maintainer='Sebastian Wagner',
     maintainer_email='[email protected]',
     python_requires='>=3.5',