Skip to content

SpiderFoot automates OSINT for threat intelligence and mapping your attack surface.

modules: Fix f-strings (#1456)

bcoles2e700d0c3809
diff --git a/modules/sfp_archiveorg.py b/modules/sfp_archiveorg.py
index 973ac6f3..6935e255 100644
--- a/modules/sfp_archiveorg.py
+++ b/modules/sfp_archiveorg.py
@@ -165,7 +165,7 @@ class sfp_archiveorg(SpiderFootPlugin):
ret = None
if not ret:
- self.sf.debug("Empty response from archive.org for {eventData}")
+ self.sf.debug(f"Empty response from archive.org for {eventData}")
continue
if len(ret['archived_snapshots']) < 1:
diff --git a/modules/sfp_c99.py b/modules/sfp_c99.py
index f3bb8878..a201a073 100644
--- a/modules/sfp_c99.py
+++ b/modules/sfp_c99.py
@@ -355,9 +355,7 @@ class sfp_c99(SpiderFootPlugin):
return
if self.opts["verify"] and not self.sf.resolveHost(data) and not self.sf.resolveHost6(data):
- self.sf.debug(
- "Host {data} could not be resolved."
- )
+ self.sf.debug(f"Host {data} could not be resolved.")
if self.getTarget().matches(data):
evt = SpiderFootEvent("INTERNET_NAME_UNRESOLVED", data, self.__name__, event)
self.notifyListeners(evt)
diff --git a/modules/sfp_github.py b/modules/sfp_github.py
index 6fd3a42e..746e2e3a 100644
--- a/modules/sfp_github.py
+++ b/modules/sfp_github.py
@@ -142,7 +142,7 @@ class sfp_github(SpiderFootPlugin):
self.sf.debug(f"{username} is not a valid GitHub profile")
return
- e = SpiderFootEvent("RAW_RIR_DATA", "Possible full name: {full_name}", self.__name__, event)
+ e = SpiderFootEvent("RAW_RIR_DATA", f"Possible full name: {full_name}", self.__name__, event)
self.notifyListeners(e)
location = json_data.get('location')
diff --git a/modules/sfp_greensnow.py b/modules/sfp_greensnow.py
index b1e193c9..5d7aa200 100644
--- a/modules/sfp_greensnow.py
+++ b/modules/sfp_greensnow.py
@@ -87,12 +87,12 @@ class sfp_greensnow(SpiderFootPlugin):
data = self.sf.fetchUrl(url, timeout=self.opts['_fetchtimeout'], useragent=self.opts['_useragent'])
if data["code"] != "200":
- self.sf.error("Unable to fetch {url}")
+ self.sf.error(f"Unable to fetch {url}")
self.errorState = True
return None
if data["content"] is None:
- self.sf.error("Unable to fetch {url}")
+ self.sf.error(f"Unable to fetch {url}")
self.errorState = True
return None
diff --git a/modules/sfp_opencorporates.py b/modules/sfp_opencorporates.py
index f0aa193a..6ded4e7b 100644
--- a/modules/sfp_opencorporates.py
+++ b/modules/sfp_opencorporates.py
@@ -209,7 +209,7 @@ class sfp_opencorporates(SpiderFootPlugin):
self.sf.debug(f"Received event, {eventName}, from {srcModuleName}")
if self.opts['api_key'] == '':
- self.sf.error("Warning: You enabled {self.__class__.__name__} but did not set an API key! Queries will be limited to 50 per day and 200 per month.")
+ self.sf.error(f"Warning: You enabled {self.__class__.__name__} but did not set an API key! Queries will be limited to 50 per day and 200 per month.")
res = self.searchCompany(f"{eventData}*")
diff --git a/modules/sfp_shodan.py b/modules/sfp_shodan.py
index 86f8c009..e7d61d91 100644
--- a/modules/sfp_shodan.py
+++ b/modules/sfp_shodan.py
@@ -100,7 +100,7 @@ class sfp_shodan(SpiderFootPlugin):
try:
r = json.loads(res['content'])
if "error" in r:
- self.sf.error("Error returned from SHODAN: {r['error']}")
+ self.sf.error(f"Error returned from SHODAN: {r['error']}")
return None
return r
except Exception as e: