From 4326d01956ed3fdfa1fee953d44d58088e84d1cc Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Wed, 11 Dec 2024 01:17:09 +0200 Subject: [PATCH] remove uses of twisted.internet.defer.returnValue This function has been deprecated in Twisted 24.7.0. --- libervia/backend/memory/disco.py | 21 ++++++++---------- libervia/backend/memory/encryption.py | 2 +- .../backend/plugins/plugin_blog_import.py | 4 ++-- .../plugin_comp_file_sharing_management.py | 4 ++-- .../plugins/plugin_exp_jingle_stream.py | 4 ++-- libervia/backend/plugins/plugin_import.py | 2 +- .../backend/plugins/plugin_misc_account.py | 22 +++++++++---------- .../plugins/plugin_misc_merge_requests.py | 2 +- .../backend/plugins/plugin_tickets_import.py | 2 +- libervia/backend/plugins/plugin_xep_0048.py | 2 +- libervia/backend/plugins/plugin_xep_0060.py | 4 ++-- .../plugins/plugin_xep_0166/__init__.py | 4 ++-- libervia/backend/plugins/plugin_xep_0277.py | 2 +- libervia/backend/tools/sat_defer.py | 2 +- 14 files changed, 36 insertions(+), 41 deletions(-) diff --git a/libervia/backend/memory/disco.py b/libervia/backend/memory/disco.py index 8dae79f4..c8ddebce 100755 --- a/libervia/backend/memory/disco.py +++ b/libervia/backend/memory/disco.py @@ -305,7 +305,7 @@ class Discovery(object): ) items = disco.DiscoItems() - defer.returnValue(items) + return items def _infos_eb(self, failure_, entity_jid): failure_.trap(StanzaError) @@ -480,15 +480,13 @@ class Discovery(object): extensions[form_type or ""] = fields - defer.returnValue( - ( - [str(f) for f in disco_infos.features], - [ - (cat, type_, name or "") - for (cat, type_), name in list(disco_infos.identities.items()) - ], - extensions, - ) + return ( + [str(f) for f in disco_infos.features], + [ + (cat, type_, name or "") + for (cat, type_), name in list(disco_infos.identities.items()) + ], + extensions, ) def items2tuples(self, disco_items): @@ -516,5 +514,4 @@ class Discovery(object): client = self.host.get_client(profile_key) entity = jid.JID(entity_jid_s) disco_items = yield self.get_items(client, entity, node, use_cache) - ret = list(self.items2tuples(disco_items)) - defer.returnValue(ret) + return list(self.items2tuples(disco_items)) diff --git a/libervia/backend/memory/encryption.py b/libervia/backend/memory/encryption.py index b442e805..a0666d4a 100644 --- a/libervia/backend/memory/encryption.py +++ b/libervia/backend/memory/encryption.py @@ -487,7 +487,7 @@ class EncryptionHandler: client = host.get_client(profile) peer_jid = jid.JID(data["jid"]).userhostJID() ui = yield client.encryption.get_trust_ui(peer_jid, plg.namespace) - defer.returnValue({"xmlui": ui.toXml()}) + return {"xmlui": ui.toXml()} ## Triggers ## diff --git a/libervia/backend/plugins/plugin_blog_import.py b/libervia/backend/plugins/plugin_blog_import.py index f6564ade..69080b3f 100644 --- a/libervia/backend/plugins/plugin_blog_import.py +++ b/libervia/backend/plugins/plugin_blog_import.py @@ -141,13 +141,13 @@ class BlogImportPlugin(object): "service": comments_service, "node": comments_node, } - defer.returnValue(recurse_kwargs) + return recurse_kwargs else: if item_import_data["comments"][0]: raise exceptions.DataError( "allow_comments set to False, but comments are there" ) - defer.returnValue(None) + return None def publish_item(self, client, mb_data, service, node, session): log.debug( diff --git a/libervia/backend/plugins/plugin_comp_file_sharing_management.py b/libervia/backend/plugins/plugin_comp_file_sharing_management.py index f16b1825..551a656d 100644 --- a/libervia/backend/plugins/plugin_comp_file_sharing_management.py +++ b/libervia/backend/plugins/plugin_comp_file_sharing_management.py @@ -130,7 +130,7 @@ class FileSharingManagement(object): workflow will be interrupted with an error note @param reason(unicode): reason of the error - @return (tuple): arguments to use in defer.returnValue + @return (tuple): value to return """ status = self._c.STATUS.COMPLETED payload = None @@ -140,7 +140,7 @@ class FileSharingManagement(object): def _get_root_args(self): """Create the form to select the file to use - @return (tuple): arguments to use in defer.returnValue + @return (tuple): value to return """ status = self._c.STATUS.EXECUTING form = data_form.Form( diff --git a/libervia/backend/plugins/plugin_exp_jingle_stream.py b/libervia/backend/plugins/plugin_exp_jingle_stream.py index b3d11e47..d087f5ef 100644 --- a/libervia/backend/plugins/plugin_exp_jingle_stream.py +++ b/libervia/backend/plugins/plugin_exp_jingle_stream.py @@ -267,7 +267,7 @@ class JingleStream(object): ) if not C.bool(confirm_data["answer"]): - defer.returnValue(False) + return False try: port = int(confirm_data["port"]) except (ValueError, KeyError): @@ -279,7 +279,7 @@ class JingleStream(object): finished_d = content_data["finished_d"] = defer.Deferred() args = [client, session, content_name, content_data] finished_d.addCallbacks(self._finished_cb, self._finished_eb, args, None, args) - defer.returnValue(True) + return True def jingle_handler(self, client, action, session, content_name, desc_elt): content_data = session["contents"][content_name] diff --git a/libervia/backend/plugins/plugin_import.py b/libervia/backend/plugins/plugin_import.py index b9235f8f..60b81fe0 100644 --- a/libervia/backend/plugins/plugin_import.py +++ b/libervia/backend/plugins/plugin_import.py @@ -259,7 +259,7 @@ class ImportPlugin(object): pubsub_service, pubsub_node, ) - defer.returnValue(progress_id) + return progress_id @defer.inlineCallbacks def recursive_import( diff --git a/libervia/backend/plugins/plugin_misc_account.py b/libervia/backend/plugins/plugin_misc_account.py index 8c39f65b..2d61b29c 100644 --- a/libervia/backend/plugins/plugin_misc_account.py +++ b/libervia/backend/plugins/plugin_misc_account.py @@ -425,7 +425,7 @@ class MiscAccount(object): @defer.inlineCallbacks def verify(attempt): auth = yield PasswordHasher.verify(attempt, sat_cipher) - defer.returnValue(auth) + return auth def error_ui(message=None): if not message: @@ -443,8 +443,8 @@ class MiscAccount(object): verified = yield verify(delete_passwd) assert isinstance(verified, bool) if verified: - defer.returnValue(self.__delete_account(profile)) - defer.returnValue(error_ui()) + return self.__delete_account(profile) + return error_ui() # check for blog posts deletion if 'GROUPBLOG' in self.host.plugins: @@ -457,8 +457,8 @@ class MiscAccount(object): verified = yield verify(delete_posts_passwd) assert isinstance(verified, bool) if verified: - defer.returnValue(self.__delete_blog_posts(posts, comments, profile)) - defer.returnValue(error_ui()) + return self.__delete_blog_posts(posts, comments, profile) + return error_ui() """ # check for password modification @@ -471,16 +471,14 @@ class MiscAccount(object): if verified: if new_passwd1 == new_passwd2: data = yield self.__change_password(new_passwd1, profile=profile) - defer.returnValue(data) + return data else: - defer.returnValue( - error_ui( - D_("The values entered for the new password are not equal.") - ) + return error_ui( + D_("The values entered for the new password are not equal.") ) - defer.returnValue(error_ui()) + return error_ui() - defer.returnValue({}) + return {} def __change_password(self, password, profile): """Ask for a confirmation before changing the XMPP account and SàT profile passwords. diff --git a/libervia/backend/plugins/plugin_misc_merge_requests.py b/libervia/backend/plugins/plugin_misc_merge_requests.py index 27c4a200..0712bb67 100644 --- a/libervia/backend/plugins/plugin_misc_merge_requests.py +++ b/libervia/backend/plugins/plugin_misc_merge_requests.py @@ -251,7 +251,7 @@ class MergeRequests(object): request_data = ticket.named_widgets[FIELD_DATA].value parsed_data = yield self.parse_data(request_type, request_data) parsed_patches.append(parsed_data) - defer.returnValue((tickets_xmlui, metadata, parsed_patches)) + return (tickets_xmlui, metadata, parsed_patches) def _set( self, diff --git a/libervia/backend/plugins/plugin_tickets_import.py b/libervia/backend/plugins/plugin_tickets_import.py index 0e8e672a..45d7826f 100644 --- a/libervia/backend/plugins/plugin_tickets_import.py +++ b/libervia/backend/plugins/plugin_tickets_import.py @@ -124,7 +124,7 @@ class TicketsImportPlugin(object): session["schema"] = yield self._s.get_schema_form( client, service, node or session["root_node"] ) - defer.returnValue(item_import_data) + return item_import_data @defer.inlineCallbacks def import_sub_items(self, client, item_import_data, ticket_data, session, options): diff --git a/libervia/backend/plugins/plugin_xep_0048.py b/libervia/backend/plugins/plugin_xep_0048.py index 3f3ac399..30b1cd4f 100644 --- a/libervia/backend/plugins/plugin_xep_0048.py +++ b/libervia/backend/plugins/plugin_xep_0048.py @@ -156,7 +156,7 @@ class XEP_0048(object): raise NotImplementedError else: raise ValueError("storage_type must be 'private' or 'pubsub'") - defer.returnValue(data) + return data @defer.inlineCallbacks def _set_server_bookmarks(self, storage_type, bookmarks_elt, profile): diff --git a/libervia/backend/plugins/plugin_xep_0060.py b/libervia/backend/plugins/plugin_xep_0060.py index c54633f6..64d09462 100644 --- a/libervia/backend/plugins/plugin_xep_0060.py +++ b/libervia/backend/plugins/plugin_xep_0060.py @@ -964,7 +964,7 @@ class XEP_0060(object): # log.debug(u"Skip the items retrieval for [{node}]: node doesn't exist".format(node=node)) # continue # avoid pubsub "item-not-found" error # d_dict[publisher] = self.get_items(service, node, max_items, None, sub_id, rsm, client.profile) - # defer.returnValue(d_dict) + # return d_dict def getOptions( self, @@ -1667,7 +1667,7 @@ class XEP_0060(object): # log.debug(u"Skip the subscription to [{node}]: node doesn't exist".format(node=nodeIdentifier)) # continue # avoid sat-pubsub "SubscriptionExists" error # d_list.append(client.pubsub_client.subscribe(service, nodeIdentifier, sub_jid or client.pubsub_client.parent.jid.userhostJID(), options=options)) - # defer.returnValue(d_list) + # return d_list # get # diff --git a/libervia/backend/plugins/plugin_xep_0166/__init__.py b/libervia/backend/plugins/plugin_xep_0166/__init__.py index f0b24ce1..1dff2e0f 100644 --- a/libervia/backend/plugins/plugin_xep_0166/__init__.py +++ b/libervia/backend/plugins/plugin_xep_0166/__init__.py @@ -1399,7 +1399,7 @@ class XEP_0166: jingle_elt, session, request, client, with_application=False ) except exceptions.CancelError: - defer.returnValue(None) + return None client.send(xmlstream.toResponse(request, "result")) @@ -1433,7 +1433,7 @@ class XEP_0166: reject_jingle_elt.addChild(child) iq_elt.send() - defer.returnValue(None) + return None # at this point, everything is alright and we can replace the transport(s) # this is similar to an session-accept action, but for transports only diff --git a/libervia/backend/plugins/plugin_xep_0277.py b/libervia/backend/plugins/plugin_xep_0277.py index 0145fe46..2677a005 100644 --- a/libervia/backend/plugins/plugin_xep_0277.py +++ b/libervia/backend/plugins/plugin_xep_0277.py @@ -605,7 +605,7 @@ class XEP_0277(object): # if other plugins have things to add or change yield self.host.trigger.point("XEP-0277_item2data", item_elt, entry_elt, mb_data) - defer.returnValue(mb_data) + return mb_data async def mb_data_2_entry_elt(self, client, mb_data, item_id, service, node): """Convert a data dict to en entry usable to create an item diff --git a/libervia/backend/tools/sat_defer.py b/libervia/backend/tools/sat_defer.py index bfdf40e3..bfd4500f 100644 --- a/libervia/backend/tools/sat_defer.py +++ b/libervia/backend/tools/sat_defer.py @@ -263,7 +263,7 @@ class RTDeferredSessions(memory.Sessions): # we can cleanly finish the session self._purge_session(session_id, got_result=True) - defer.returnValue((len(filtered_data), results)) + return (len(filtered_data), results) # we wait for a result return session_data[KEY_NEXT].addCallback(next_cb)