Philipp Hörist pushed to branch master at gajim / python-nbxmpp
Commits: 328bd01b by lovetox at 2020-10-17T22:39:12+02:00 Blocking: Process response correctly
- - - - - 38eafe8a by lovetox at 2020-10-17T22:39:40+02:00 Bookmarks: Process response correctly
- - - - - 6ecb10ab by lovetox at 2020-10-17T22:40:18+02:00 SoftwareVersion: Process response correctly
- - - - -
3 changed files:
- nbxmpp/modules/blocking.py - nbxmpp/modules/bookmarks/private_bookmarks.py - nbxmpp/modules/software_version.py
Changes:
===================================== nbxmpp/modules/blocking.py ===================================== @@ -19,12 +19,12 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq from nbxmpp.protocol import JID from nbxmpp.modules.base import BaseModule -from nbxmpp.modules.util import raise_if_error -from nbxmpp.modules.util import finalize -from nbxmpp.task import iq_request_task +from nbxmpp.errors import StanzaError from nbxmpp.errors import MalformedStanzaError +from nbxmpp.task import iq_request_task from nbxmpp.structs import BlockingPush from nbxmpp.structs import StanzaHandler +from nbxmpp.modules.util import process_response
class Blocking(BaseModule): @@ -45,8 +45,8 @@ class Blocking(BaseModule): _task = yield
result = yield _make_blocking_list_request() - - raise_if_error(result) + if result.isError(): + raise StanzaError(result)
blocklist = result.getTag('blocklist', namespace=Namespace.BLOCKING) if blocklist is None: @@ -61,21 +61,21 @@ class Blocking(BaseModule):
@iq_request_task def block(self, jids, report=None): - task = yield + _task = yield
self._log.info('Block: %s', jids)
- result = yield _make_block_request(jids, report) - yield finalize(task, result) + response = yield _make_block_request(jids, report) + yield process_response(response)
@iq_request_task def unblock(self, jids): - task = yield + _task = yield
self._log.info('Unblock: %s', jids)
- result = yield _make_unblock_request(jids) - yield finalize(task, result) + response = yield _make_unblock_request(jids) + yield process_response(response)
@staticmethod def _process_blocking_push(client, stanza, properties):
===================================== nbxmpp/modules/bookmarks/private_bookmarks.py ===================================== @@ -18,8 +18,8 @@ from nbxmpp.namespaces import Namespace from nbxmpp.protocol import Iq from nbxmpp.task import iq_request_task -from nbxmpp.modules.util import raise_if_error -from nbxmpp.modules.util import finalize +from nbxmpp.errors import StanzaError +from nbxmpp.modules.util import process_response from nbxmpp.modules.base import BaseModule from nbxmpp.modules.bookmarks.util import build_storage_node from nbxmpp.modules.bookmarks.util import get_private_request @@ -39,8 +39,8 @@ class PrivateBookmarks(BaseModule): _task = yield
response = yield get_private_request() - raise_if_error(response) - + if response.isError(): + raise StanzaError(response)
bookmarks = parse_private_bookmarks(response, self._log) for bookmark in bookmarks: @@ -50,10 +50,10 @@ class PrivateBookmarks(BaseModule):
@iq_request_task def store_bookmarks(self, bookmarks): - task = yield + _task = yield
self._log.info('Store Bookmarks')
storage_node = build_storage_node(bookmarks) - result = yield Iq('set', Namespace.PRIVATE, payload=storage_node) - yield finalize(task, result) + response = yield Iq('set', Namespace.PRIVATE, payload=storage_node) + yield process_response(response)
===================================== nbxmpp/modules/software_version.py ===================================== @@ -23,9 +23,9 @@ from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE from nbxmpp.structs import SoftwareVersionResult from nbxmpp.structs import StanzaHandler from nbxmpp.modules.base import BaseModule -from nbxmpp.modules.util import raise_if_error from nbxmpp.task import iq_request_task from nbxmpp.errors import MalformedStanzaError +from nbxmpp.errors import StanzaError
class SoftwareVersion(BaseModule): @@ -55,11 +55,11 @@ class SoftwareVersion(BaseModule):
self._log.info('Request software version for %s', jid)
- result = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) + response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION) + if response.isError(): + raise StanzaError(response)
- raise_if_error(result) - - yield _parse_info(result) + yield _parse_info(response)
def set_software_version(self, name, version, os=None): self._name, self._version, self._os = name, version, os
View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/e68838b484a3af1cb7b7f498...