jenkins-bot submitted this change.

View Change

Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified
[Error] use exceptions.Error instead of pywikibot.Error

Bug: T280227
Change-Id: Idaa0cbae39ec12a98ce9157d951c03bd2fd578d9
---
M generate_family_file.py
M tests/aspects.py
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/generate_family_file.py b/generate_family_file.py
index 55dd8f3..13790a5 100755
--- a/generate_family_file.py
+++ b/generate_family_file.py
@@ -56,7 +56,7 @@
for verify in (True, False):
try:
w = self.Wiki(self.base_url, verify=verify)
- except pywikibot.FatalServerError:
+ except pywikibot.exceptions.FatalServerError:
print('ERROR: '
+ pywikibot.comms.http.SSL_CERT_VERIFY_FAILED_MSG)
pywikibot.exception()
diff --git a/tests/aspects.py b/tests/aspects.py
index 6e725f0..5831ab7 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -28,7 +28,11 @@
from pywikibot.backports import removeprefix
from pywikibot.comms import http
from pywikibot.data.api import Request as _original_Request
-from pywikibot.exceptions import NoUsernameError, ServerError
+from pywikibot.exceptions import (
+ NoUsernameError,
+ ServerError,
+ SiteDefinitionError,
+)
from pywikibot.family import WikimediaFamily
from pywikibot.site import BaseSite
from pywikibot.tools import suppress_warnings
@@ -357,7 +361,7 @@

def __init__(self, code, fam=None, user=None):
"""Initializer."""
- raise pywikibot.SiteDefinitionError(
+ raise SiteDefinitionError(
'Loading site {}:{} during dry test not permitted'
.format(fam, code))


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

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Idaa0cbae39ec12a98ce9157d951c03bd2fd578d9
Gerrit-Change-Number: 683913
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia@gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged