diff options
Diffstat (limited to 'src/saml2test')
| -rw-r--r-- | src/saml2test/__init__.py | 4 | ||||
| -rw-r--r-- | src/saml2test/check.py | 2 | ||||
| -rw-r--r-- | src/saml2test/opfunc.py | 4 | ||||
| -rw-r--r-- | src/saml2test/tool.py | 6 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/saml2test/__init__.py b/src/saml2test/__init__.py index 81eace7f..e4f1d6bf 100644 --- a/src/saml2test/__init__.py +++ b/src/saml2test/__init__.py @@ -88,9 +88,9 @@ def exception_trace(tag, exc, log=None): message = traceback.format_exception(*sys.exc_info()) try: - _exc = "Exception: %s" % exc + _exc = f"Exception: {exc}" except UnicodeEncodeError: - _exc = "Exception: %s" % exc.message.encode("utf-8", "replace") + _exc = f"Exception: {exc.message.encode('utf-8', 'replace')}" return {"status": CRITICAL, "message": _exc, "content": "".join(message)} diff --git a/src/saml2test/check.py b/src/saml2test/check.py index 47ea170c..158397fb 100644 --- a/src/saml2test/check.py +++ b/src/saml2test/check.py @@ -164,7 +164,7 @@ class VerifyError(Error): try: assert item["error"] in self._kwargs["error"] except AssertionError: - self._message = "Wrong type of error, got %s" % item["error"] + self._message = f"Wrong type of error, got {item['error']}" self._status = self.status return {} diff --git a/src/saml2test/opfunc.py b/src/saml2test/opfunc.py index 78096c2e..51b01b0c 100644 --- a/src/saml2test/opfunc.py +++ b/src/saml2test/opfunc.py @@ -212,9 +212,7 @@ def do_click(client, form, **kwargs): else: _nr += 1 except ControlNotFoundError: - raise Exception( - "No submit control with the name='%s' and " "value='%s' could be found" % (_name, _val) - ) + raise Exception(f"No submit control with the name='{_name}' and value='{_val}' could be found") else: request = form.click() diff --git a/src/saml2test/tool.py b/src/saml2test/tool.py index b0bbf66c..fa600955 100644 --- a/src/saml2test/tool.py +++ b/src/saml2test/tool.py @@ -87,7 +87,7 @@ class Conversation: chk = self.check_factory(test)() chk(self, self.test_output) if bryt: - e = FatalError("%s" % err) + e = FatalError(f"{err}") e.trace = "".join(traceback.format_exception(*sys.exc_info())) raise e @@ -125,7 +125,7 @@ class Conversation: else: rdseq.append(url) if len(rdseq) > 8: - raise FatalError("Too long sequence of redirects: %s" % rdseq) + raise FatalError(f"Too long sequence of redirects: {rdseq}") logger.info("HTTP %d Location: %s", _response.status_code, url) # If back to me @@ -153,7 +153,7 @@ class Conversation: logger.info("GET %s", url) _response = self.client.send(url, "GET") except Exception as err: - raise FatalError("%s" % err) + raise FatalError(f"{err}") content = _response.text logger.info("<-- CONTENT: %s", content) |