From d3113ed2d857b30bb076903100bab5fb3d59e916 Mon Sep 17 00:00:00 2001 From: Goffi Date: Mon, 30 Mar 2026 12:03:16 +0200 Subject: [PATCH] core: fix failure raising with exception classes: When raising a `Failure` with an exception, the `Exception` class can't be used, it must be an instance. --- libervia/backend/memory/params.py | 2 +- libervia/backend/plugins/plugin_misc_account.py | 2 +- libervia/backend/plugins/plugin_xep_0234.py | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libervia/backend/memory/params.py b/libervia/backend/memory/params.py index 9dfc31c9..67c959fd 100644 --- a/libervia/backend/memory/params.py +++ b/libervia/backend/memory/params.py @@ -207,7 +207,7 @@ class Params(object): self.host.disconnect(profile) else: log.info(_("Trying to delete a connected profile")) - return defer.fail(Failure(exceptions.ProfileConnected)) + return defer.fail(Failure(exceptions.ProfileConnected())) return self.storage.delete_profile(profile) def get_profile_name(self, profile_key, return_profile_keys=False): diff --git a/libervia/backend/plugins/plugin_misc_account.py b/libervia/backend/plugins/plugin_misc_account.py index 5fddb7c1..60ed27e7 100644 --- a/libervia/backend/plugins/plugin_misc_account.py +++ b/libervia/backend/plugins/plugin_misc_account.py @@ -224,7 +224,7 @@ class MiscAccount(object): raise exceptions.DataError if profile.lower() in RESERVED_LIST: - return defer.fail(Failure(exceptions.ConflictError)) + return defer.fail(Failure(exceptions.ConflictError())) d = self.host.memory.create_profile(profile, password) d.addCallback(lambda __: self.profile_created(password, jid_s, profile)) diff --git a/libervia/backend/plugins/plugin_xep_0234.py b/libervia/backend/plugins/plugin_xep_0234.py index 148138b6..0c546c39 100644 --- a/libervia/backend/plugins/plugin_xep_0234.py +++ b/libervia/backend/plugins/plugin_xep_0234.py @@ -728,7 +728,7 @@ class XEP_0234(BaseApplicationHandler): try: file_elt = next(desc_elt.elements(NS_JINGLE_FT, "file")) except StopIteration: - raise failure.Failure(exceptions.DataError) + raise failure.Failure(exceptions.DataError()) file_data = {"progress_id": self.get_progress_id(session, content_name)} if senders == self._j.ROLE_RESPONDER: @@ -800,7 +800,7 @@ class XEP_0234(BaseApplicationHandler): try: hash_algo = self._hash.parse_hash_used_elt(file_elt) except exceptions.NotFound: - raise failure.Failure(exceptions.DataError) + raise failure.Failure(exceptions.DataError()) # deferred to track end of transfer finished_d = content_data["finished_d"] = defer.Deferred() @@ -838,7 +838,7 @@ class XEP_0234(BaseApplicationHandler): try: file_data["size"] = int(file_data["size"]) except ValueError: - raise failure.Failure(exceptions.DataError) + raise failure.Failure(exceptions.DataError()) content_data["application_data"]["file_data"] = file_data