jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868132 )
Change subject: [IMPR] ignore original exception in BaseSite.__getattr__()
......................................................................
[IMPR] ignore original exception in BaseSite.__getattr__()
- ignore original exception usually from Family class
when raising AttributeError in BaseSite.__getattr__()
- also refactor exception message to use f-strings
Change-Id: I119fca320debdaa437c5acb5b61260b5223042c1
---
M pywikibot/site/_basesite.py
1 file changed, 15 insertions(+), 2 deletions(-)
Approvals:
RoySmith: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py
index 80dacc7..7142d99 100644
--- a/pywikibot/site/_basesite.py
+++ b/pywikibot/site/_basesite.py
@@ -197,8 +197,8 @@
f.__doc__ = method.__doc__
return f
except AttributeError:
- raise AttributeError("{} instance has no attribute '{}'"
- .format(self.__class__.__name__, attr))
+ raise AttributeError(f'{type(self).__name__} instance has no '
+ f'attribute {attr!r}') from None
def __str__(self) -> str:
"""Return string representing this Site's name and code."""
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868132
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I119fca320debdaa437c5acb5b61260b5223042c1
Gerrit-Change-Number: 868132
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: RoySmith <roy(a)panix.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868094 )
Change subject: [IMPR] Remove obsolete code from BaseSite.__getattr__()
......................................................................
[IMPR] Remove obsolete code from BaseSite.__getattr__()
__getattr__ is only called when the default attribute access fails
Change-Id: Ieddaeb938fffb032cef20f4bf0f9890b9131c701
---
M pywikibot/site/_basesite.py
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
RoySmith: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py
index 80dacc7..de5f5c9 100644
--- a/pywikibot/site/_basesite.py
+++ b/pywikibot/site/_basesite.py
@@ -186,8 +186,6 @@
def __getattr__(self, attr):
"""Delegate undefined methods calls to the Family object."""
- if hasattr(self.__class__, attr):
- return getattr(self.__class__, attr)
try:
method = getattr(self.family, attr)
if not callable(method):
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868094
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ieddaeb938fffb032cef20f4bf0f9890b9131c701
Gerrit-Change-Number: 868094
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: RoySmith <roy(a)panix.com>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868099 )
Change subject: [doc] userinterface_lang is obtained from locale.getlocale by default
......................................................................
[doc] userinterface_lang is obtained from locale.getlocale by default
locale.getdefaultlocale will be removed in Python 3.13.
Update documentation; the code was already changed.
Change-Id: Ia80df9ded08c6baf57e77b61103a86151a5022a3
---
M docs/introduction.rst
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/introduction.rst b/docs/introduction.rst
index 922fd22..b5dc1fb 100644
--- a/docs/introduction.rst
+++ b/docs/introduction.rst
@@ -31,7 +31,7 @@
#. set the `userinterface_lang` in your :ref:`user-config.py<User Interface Settings>` to your preferred language
#. set environment variable `PYWIKIBOT_USERINTERFACE_LANG` to your preferred language
-#. default is obtained from `locale.getdefaultlocale`
+#. default is obtained from `locale.getlocale`
#. fallback is `'en'` for English if all other options fails
.. note:: The preferred language code must follow ISO 639.
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/868099
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ia80df9ded08c6baf57e77b61103a86151a5022a3
Gerrit-Change-Number: 868099
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged