Philipp Hörist pushed to branch master at gajim / python-nbxmpp

Commits:

3 changed files:

Changes:

  • nbxmpp/modules/blocking.py
    ... ... @@ -19,12 +19,12 @@ from nbxmpp.namespaces import Namespace
    19 19 
     from nbxmpp.protocol import Iq
    20 20 
     from nbxmpp.protocol import JID
    21 21 
     from nbxmpp.modules.base import BaseModule
    22 
    -from nbxmpp.modules.util import raise_if_error
    23 
    -from nbxmpp.modules.util import finalize
    24 
    -from nbxmpp.task import iq_request_task
    22 
    +from nbxmpp.errors import StanzaError
    25 23 
     from nbxmpp.errors import MalformedStanzaError
    24 
    +from nbxmpp.task import iq_request_task
    26 25 
     from nbxmpp.structs import BlockingPush
    27 26 
     from nbxmpp.structs import StanzaHandler
    27 
    +from nbxmpp.modules.util import process_response
    28 28
    29 29
    30 30 
     class Blocking(BaseModule):
    ... ... @@ -45,8 +45,8 @@ class Blocking(BaseModule):
    45 45 
             _task = yield
    46 46
    47 47 
             result = yield _make_blocking_list_request()
    48 
    -
    49 
    -        raise_if_error(result)
    48 
    +        if result.isError():
    49 
    +            raise StanzaError(result)
    50 50
    51 51 
             blocklist = result.getTag('blocklist', namespace=Namespace.BLOCKING)
    52 52 
             if blocklist is None:
    ... ... @@ -61,21 +61,21 @@ class Blocking(BaseModule):
    61 61
    62 62 
         @iq_request_task
    63 63 
         def block(self, jids, report=None):
    64 
    -        task = yield
    64 
    +        _task = yield
    65 65
    66 66 
             self._log.info('Block: %s', jids)
    67 67
    68 
    -        result = yield _make_block_request(jids, report)
    69 
    -        yield finalize(task, result)
    68 
    +        response = yield _make_block_request(jids, report)
    69 
    +        yield process_response(response)
    70 70
    71 71 
         @iq_request_task
    72 72 
         def unblock(self, jids):
    73 
    -        task = yield
    73 
    +        _task = yield
    74 74
    75 75 
             self._log.info('Unblock: %s', jids)
    76 76
    77 
    -        result = yield _make_unblock_request(jids)
    78 
    -        yield finalize(task, result)
    77 
    +        response = yield _make_unblock_request(jids)
    78 
    +        yield process_response(response)
    79 79
    80 80 
         @staticmethod
    81 81 
         def _process_blocking_push(client, stanza, properties):

  • nbxmpp/modules/bookmarks/private_bookmarks.py
    ... ... @@ -18,8 +18,8 @@
    18 18 
     from nbxmpp.namespaces import Namespace
    19 19 
     from nbxmpp.protocol import Iq
    20 20 
     from nbxmpp.task import iq_request_task
    21 
    -from nbxmpp.modules.util import raise_if_error
    22 
    -from nbxmpp.modules.util import finalize
    21 
    +from nbxmpp.errors import StanzaError
    22 
    +from nbxmpp.modules.util import process_response
    23 23 
     from nbxmpp.modules.base import BaseModule
    24 24 
     from nbxmpp.modules.bookmarks.util import build_storage_node
    25 25 
     from nbxmpp.modules.bookmarks.util import get_private_request
    ... ... @@ -39,8 +39,8 @@ class PrivateBookmarks(BaseModule):
    39 39 
             _task = yield
    40 40
    41 41 
             response = yield get_private_request()
    42 
    -        raise_if_error(response)
    43 
    -
    42 
    +        if response.isError():
    43 
    +            raise StanzaError(response)
    44 44
    45 45 
             bookmarks = parse_private_bookmarks(response, self._log)
    46 46 
             for bookmark in bookmarks:
    ... ... @@ -50,10 +50,10 @@ class PrivateBookmarks(BaseModule):
    50 50
    51 51 
         @iq_request_task
    52 52 
         def store_bookmarks(self, bookmarks):
    53 
    -        task = yield
    53 
    +        _task = yield
    54 54
    55 55 
             self._log.info('Store Bookmarks')
    56 56
    57 57 
             storage_node = build_storage_node(bookmarks)
    58 
    -        result = yield Iq('set', Namespace.PRIVATE, payload=storage_node)
    59 
    -        yield finalize(task, result)
    58 
    +        response = yield Iq('set', Namespace.PRIVATE, payload=storage_node)
    59 
    +        yield process_response(response)

  • nbxmpp/modules/software_version.py
    ... ... @@ -23,9 +23,9 @@ from nbxmpp.protocol import ERR_SERVICE_UNAVAILABLE
    23 23 
     from nbxmpp.structs import SoftwareVersionResult
    24 24 
     from nbxmpp.structs import StanzaHandler
    25 25 
     from nbxmpp.modules.base import BaseModule
    26 
    -from nbxmpp.modules.util import raise_if_error
    27 26 
     from nbxmpp.task import iq_request_task
    28 27 
     from nbxmpp.errors import MalformedStanzaError
    28 
    +from nbxmpp.errors import StanzaError
    29 29
    30 30
    31 31 
     class SoftwareVersion(BaseModule):
    ... ... @@ -55,11 +55,11 @@ class SoftwareVersion(BaseModule):
    55 55
    56 56 
             self._log.info('Request software version for %s', jid)
    57 57
    58 
    -        result = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION)
    58 
    +        response = yield Iq(typ='get', to=jid, queryNS=Namespace.VERSION)
    59 
    +        if response.isError():
    60 
    +            raise StanzaError(response)
    59 61
    60 
    -        raise_if_error(result)
    61 
    -
    62 
    -        yield _parse_info(result)
    62 
    +        yield _parse_info(response)
    63 63
    64 64 
         def set_software_version(self, name, version, os=None):
    65 65 
             self._name, self._version, self._os = name, version, os

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. If you'd like to receive fewer emails, you can adjust your notification settings.