jenkins-bot merged this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[bugfix] Raise ServerError also if connection to PetScan timeouts

Change-Id: Ifc7cc4f15b7f6e7038f1bd13a5db649433a7bac9
---
M pywikibot/pagegenerators.py
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 077fddf..b2d2c42 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -30,6 +30,7 @@

from datetime import timedelta
from functools import partial
+from requests.exceptions import ReadTimeout
from warnings import warn

import pywikibot
@@ -3077,7 +3078,11 @@
"""Query PetScan."""
url = 'https://petscan.wmflabs.org'

- req = http.fetch(url, params=self.opts)
+ try:
+ req = http.fetch(url, params=self.opts)
+ except ReadTimeout:
+ raise ServerError(
+ 'received ReadTimeout from {0}'.format(url))
if 500 <= req.status < 600:
raise ServerError(
'received {0} status from {1}'.format(req.status, req.uri))

To view, visit change 585729. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc7cc4f15b7f6e7038f1bd13a5db649433a7bac9
Gerrit-Change-Number: 585729
Gerrit-PatchSet: 4
Gerrit-Owner: Dvorapa <dvorapa@seznam.cz>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot (75)