jenkins-bot has submitted this change and it was merged.
Change subject: wdq: Improve errors in getDataFromHost
......................................................................
wdq: Improve errors in getDataFromHost
Bug: T93305
Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
---
M pywikibot/data/wikidataquery.py
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
XZise: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/data/wikidataquery.py b/pywikibot/data/wikidataquery.py
index 80d2616..2d7ee3a 100644
--- a/pywikibot/data/wikidataquery.py
+++ b/pywikibot/data/wikidataquery.py
@@ -565,11 +565,20 @@
pywikibot.warning(u"Failed to retrieve %s" % url)
raise
+ data = resp.content
+ if not data:
+ pywikibot.warning('No data received for %s' % url)
+ raise pywikibot.ServerError('No data received for %s' % url)
+
try:
- data = json.loads(resp.content)
+ data = json.loads(data)
except ValueError:
- pywikibot.warning(u"Data received from host but no JSON could be
decoded")
- raise pywikibot.ServerError("Data received from host but no JSON
could be decoded")
+ pywikibot.warning(
+ 'Data received for %s but no JSON could be decoded: %r'
+ % (url, data))
+ raise pywikibot.ServerError(
+ 'Data received for %s but no JSON could be decoded: %r'
+ % (url, data))
return data
--
To view, visit https://gerrit.wikimedia.org/r/214051
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If11b5e5c4dffa4fbe78ff8e0066f7ec7fe6e99d0
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: XZise <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
