Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/python-nbxmpp.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlovetox <philipp@hoerist.com>2020-03-11 00:52:47 +0300
committerlovetox <philipp@hoerist.com>2020-03-11 00:52:47 +0300
commiteabe1064b64438b6d9ea4ba4db44cd1ef76c9d27 (patch)
tree8a15fae55729da69854e0588fe415c1c64fda4ee /nbxmpp/modules
parent224b3635257fa860b4f0d521973dde110cc07a07 (diff)
Muclumbus: Call callback also on error
The method retuned instead of calling the callback
Diffstat (limited to 'nbxmpp/modules')
-rw-r--r--nbxmpp/modules/muclumbus.py43
1 files changed, 22 insertions, 21 deletions
diff --git a/nbxmpp/modules/muclumbus.py b/nbxmpp/modules/muclumbus.py
index 264e290..d749272 100644
--- a/nbxmpp/modules/muclumbus.py
+++ b/nbxmpp/modules/muclumbus.py
@@ -158,27 +158,33 @@ class Muclumbus:
items=results)
def _http_search_received(self, _session, message, callback, user_data):
+
+ def exec_callback(muclumbus_result):
+ if user_data is None:
+ callback(muclumbus_result)
+ else:
+ callback(muclumbus_result, user_data)
+
soup_body = message.get_property('response-body')
if message.status_code != 200:
log.warning(soup_body.data)
- return MuclumbusResult(first=None,
- last=None,
- max=None,
- end=True,
- items=[])
-
+ exec_callback(MuclumbusResult(first=None,
+ last=None,
+ max=None,
+ end=True,
+ items=[]))
response = json.loads(soup_body.data)
result = response['result']
items = result.get('items')
if items is None:
- return MuclumbusResult(first=None,
- last=None,
- max=None,
- end=True,
- items=[])
+ exec_callback(MuclumbusResult(first=None,
+ last=None,
+ max=None,
+ end=True,
+ items=[]))
results = []
for item in items:
@@ -196,13 +202,8 @@ class Muclumbus:
is_open=item['is_open'],
anonymity_mode=anonymity_mode))
- muclumbus_result = MuclumbusResult(first=None,
- last=result['last'],
- max=None,
- end=not result['more'],
- items=results)
-
- if user_data is None:
- callback(muclumbus_result)
- else:
- callback(muclumbus_result, user_data)
+ exec_callback(MuclumbusResult(first=None,
+ last=result['last'],
+ max=None,
+ end=not result['more'],
+ items=results))