Flake8: Resolve various I Q0 SIM B9 A D violations (smicallef#1321)

modules/sfp_alienvault.py

@@ -15,9 +15,10 @@
 import urllib.error
 import urllib.parse
 import urllib.request
-
 from datetime import datetime
+
 from netaddr import IPNetwork
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_alienvaultiprep.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 from netaddr import IPAddress, IPNetwork
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_c99.py

@@ -11,7 +11,8 @@
 # -------------------------------------------------------------------------------
 
 import json
-from spiderfoot import SpiderFootPlugin, SpiderFootEvent
+
+from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 
 class sfp_c99(SpiderFootPlugin):

modules/sfp_citadel.py

@@ -11,10 +11,10 @@
 # -------------------------------------------------------------------------------
 
 import json
+import time
 import urllib.error
 import urllib.parse
 import urllib.request
-import time
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 

modules/sfp_debounce.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 import json
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_dehashed.py

@@ -9,9 +9,10 @@
 # Licence:     GPL
 # -------------------------------------------------------------------------------
 
+import base64
 import json
 import time
-import base64
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_dnsdb.py

@@ -12,9 +12,9 @@
 
 import json
 import re
+import time
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
-import time
 
 
 class sfp_dnsdb(SpiderFootPlugin):

modules/sfp_dnsdumpster.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 import re
+
 from bs4 import BeautifulSoup
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin

modules/sfp_emailformat.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 import re
+
 from bs4 import BeautifulSoup
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin

modules/sfp_filemeta.py

@@ -14,10 +14,13 @@
 import io
 import mimetypes
 
+import PyPDF2
+
 import docx
+
 import exifread
+
 import pptx
-import PyPDF2
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 

modules/sfp_gleif.py

@@ -11,10 +11,10 @@
 # Licence:     GPL
 # -------------------------------------------------------------------------------
 
-import urllib
 import json
+import urllib
 
-from spiderfoot import SpiderFootEvent, SpiderFootPlugin, SpiderFootHelpers
+from spiderfoot import SpiderFootEvent, SpiderFootHelpers, SpiderFootPlugin
 
 
 class sfp_gleif(SpiderFootPlugin):

modules/sfp_googlemaps.py

@@ -11,8 +11,8 @@
 # Licence:     GPL
 # -------------------------------------------------------------------------------
 
-import urllib
 import json
+import urllib
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 

modules/sfp_grayhatwarfare.py

@@ -12,6 +12,7 @@
 import json
 import time
 import urllib
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_haveibeenpwned.py

@@ -10,8 +10,8 @@
 # -------------------------------------------------------------------------------
 
 import json
-import time
 import re
+import time
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
@@ -216,7 +216,7 @@ def handleEvent(self, event):
             try:
                 source = n.get("Source")
                 site = source
-                if source in sites.keys():
+                if source in sites:
                     site = f"{sites[n.get('Source')]}{n.get('Id')}"
                     links.add(site)
 

modules/sfp_multiproxy.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 from netaddr import IPAddress, IPNetwork
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_nameapi.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 import json
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_opencorporates.py

@@ -11,8 +11,8 @@
 # Licence:     GPL
 # -------------------------------------------------------------------------------
 
-import urllib
 import json
+import urllib
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 

modules/sfp_portscan_tcp.py

@@ -16,6 +16,7 @@
 import time
 
 from netaddr import IPNetwork
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_spider.py

@@ -14,7 +14,7 @@
 import json
 import time
 
-from spiderfoot import SpiderFootEvent, SpiderFootPlugin, SpiderFootHelpers
+from spiderfoot import SpiderFootEvent, SpiderFootHelpers, SpiderFootPlugin
 
 
 class sfp_spider(SpiderFootPlugin):

modules/sfp_torexits.py

@@ -11,6 +11,7 @@
 # -------------------------------------------------------------------------------
 
 import re
+
 from netaddr import IPAddress, IPNetwork
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin

modules/sfp_trashpanda.py

@@ -11,8 +11,8 @@
 # Licence:     GPL
 # -------------------------------------------------------------------------------
 
-import json
 import base64
+import json
 import re
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin

modules/sfp_trumail.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 import json
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_voipbl.py

@@ -12,6 +12,7 @@
 # -------------------------------------------------------------------------------
 
 from netaddr import IPAddress, IPNetwork
+
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
 

modules/sfp_whois.py

@@ -12,11 +12,13 @@
 # -------------------------------------------------------------------------------
 
 import ipwhois
-import whois
+
 from netaddr import IPAddress
 
 from spiderfoot import SpiderFootEvent, SpiderFootPlugin
 
+import whois
+
 
 class sfp_whois(SpiderFootPlugin):
 

setup.cfg

@@ -1,27 +1,30 @@
 [flake8]
 flake8-max-line-length = 120
-max-line-length = 120
-max-complexity = 80
+max-complexity = 60
 select = C,E,F,W,I,B,DUO,D,R,A,S,Q0,SIM,SFS
-# Note: B9 and SIM tests should be reviewed and fixed instead of ignored
-ignore = E501 W503 B006 E800 B9 SFS301 SF01 Q000 SIM102 SIM110 SIM111 SIM113 SIM115 SIM118
+# Note: D and SIM tests should be reviewed and fixed instead of ignored
+ignore = E501 W503 B006 E800 SFS301 SF01 Q000 SIM102 SIM113 SIM115 D100 D104
 # Note: most of these should be fixed instead of ignored
 per-file-ignores =
     spiderfoot/event.py:A,D
-    spiderfoot/plugin.py:I,D
-    spiderfoot/db.py:A,D,SFS101,SIM106
-    sf.py:I,D,SFS101,SFS201
-    sflib.py:I,D,SFS101
-    sfwebui.py:A,I,D,SFS101,Q003
-    sfscan.py:I,D,SIM105,SIM109
-    modules/*:I,D
+    spiderfoot/plugin.py:D,B902
+    spiderfoot/db.py:D,SFS101,B902
+    spiderfoot/helpers.py:D
+    spiderfoot/target.py:D
+    spiderfoot/logger.py:D
+    sf.py:I,D,SFS201,B902
+    sflib.py:I,D,SFS101,SIM110,SIM111,B902
+    sfwebui.py:A,B902
+    sfscan.py:I,D,SIM105,B902
+    modules/*:D,B902
+    modules/sfp_binaryedge.py:D,B902,C901
     modules/sfp__stor_stdout.py:D,SFS201
     modules/sfp_bitcoin.py:D,SFS101
     modules/sfp_reversewhois.py:D,R504
-    modules/sfp_zetalytics.py:D,R504
-    spiderfoot/*:I,D
+    modules/sfp_ripe.py:D,SIM110,B902
+    modules/sfp_zetalytics.py:D,R504,B902
     spiderfoot/__init__.py:I,D,F401
-    sfcli.py:D
+    sfcli.py:D,B902
     test/*:I,D,SIM117
     docs/conf.py:A,D
 

sfscan.py

@@ -165,7 +165,7 @@ def __init__(self, scanName, scanId, targetValue, targetType, moduleList, global
             proxy_port = int(self.__config.get('_socks3port') or 0)
 
             if not proxy_port:
-                if proxy_type == '4' or proxy_type == '5':
+                if proxy_type in ['4', '5']:
                     proxy_port = 1080
                 elif proxy_type.upper() == 'HTTP':
                     proxy_port = 8080