jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/425825 )
Change subject: [IMPR] Simplify event data checking ...................................................................... [IMPR] Simplify event data checking Change-Id: I4909e9c09bb5c7b54678f165b07348d2f1e9ed3a --- M pywikibot/comms/eventstreams.py 1 file changed, 12 insertions(+), 11 deletions(-) Approvals: Framawiki: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py index fe34d66..fb86530 100644 --- a/pywikibot/comms/eventstreams.py +++ b/pywikibot/comms/eventstreams.py @@ -280,18 +280,19 @@ if event is not None: self.sse_kwargs['last_id'] = event.id continue - if event.event == 'message' and event.data: - try: - element = json.loads(event.data) - except ValueError as e: - warning('Could not load json data from\n{0}\n{1}' - .format(event, e)) + if event.event == 'message': + if event.data: + try: + element = json.loads(event.data) + except ValueError as e: + warning('Could not load json data from\n{0}\n{1}' + .format(event, e)) + else: + if self.streamfilter(element): + n += 1 + yield element else: - if self.streamfilter(element): - n += 1 - yield element - elif event.event == 'message' and not event.data: - warning('Empty message found.') + warning('Empty message found.') elif event.event == 'error': warning('Encountered error: {0}'.format(event.data)) else: -- To view, visit https://gerrit.wikimedia.org/r/425825 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4909e9c09bb5c7b54678f165b07348d2f1e9ed3a Gerrit-Change-Number: 425825 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <i...@gno.de> Gerrit-Reviewer: Framawiki <framaw...@tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jay...@gmail.com> Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com> Gerrit-Reviewer: jenkins-bot <>
_______________________________________________ Pywikibot-commits mailing list Pywikibot-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits