jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/431087 )
Change subject: Fix MementoClientException import
......................................................................
Fix MementoClientException import
MementoClientException is located in memento_client.memento_client.
Also add this exception to retry loop of weblinkchecker.py.
Bug: T193924
Change-Id: I4d34c0264417d9e0c22bef6e6d84705a31eefdb3
---
M scripts/weblinkchecker.py
M tests/weblinkchecker_tests.py
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index 71bccd1..161692e 100755
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -120,6 +120,7 @@
try:
import memento_client
+ from memento_client.memento_client import MementoClientException
except ImportError as e:
memento_client = e
@@ -199,7 +200,7 @@
try:
memento_info = mc.get_memento_info(url, when)
break
- except requests.ConnectionError as e:
+ except (requests.ConnectionError, MementoClientException) as e:
error = e
retry_count += 1
sleep(config2.retry_wait)
diff --git a/tests/weblinkchecker_tests.py b/tests/weblinkchecker_tests.py
index 2502532..d04bd6c 100644
--- a/tests/weblinkchecker_tests.py
+++ b/tests/weblinkchecker_tests.py
@@ -28,7 +28,8 @@
"""Test memento client."""
def _get_archive_url(self, url, date_string=None):
- from memento_client import MementoClientException # noqa: E402
+ from memento_client.memento_client import \
+ MementoClientException # noqa: E402
if date_string is None:
when = datetime.datetime.now()
--
To view, visit
https://gerrit.wikimedia.org/r/431087
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I4d34c0264417d9e0c22bef6e6d84705a31eefdb3
Gerrit-Change-Number: 431087
Gerrit-PatchSet: 1
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot <>