jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894675 )
Change subject: [impr] clean_sandbox: Use non-substed text for es.wikibooks
......................................................................
[impr] clean_sandbox: Use non-substed text for es.wikibooks
Change-Id: I6e98d3061a4ba3089209c8fa7d3ca8763af355ab
---
M scripts/clean_sandbox.py
1 file changed, 10 insertions(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/clean_sandbox.py b/scripts/clean_sandbox.py
index 10bca7c..0ca49cb 100755
--- a/scripts/clean_sandbox.py
+++ b/scripts/clean_sandbox.py
@@ -67,7 +67,7 @@
'== Please start your testing below this line ==',
'wikidata': '{{Please leave this line alone (sandbox heading)}}',
'wikibooks': {
- 'es': '{{subst:ZDP/2}}',
+ 'es': '{{ZDP}}\n== Haz tus pruebas bajo esta sección ==',
'ru': '{{/Шапка}}\n'
'<!-- Не удаляйте, пожалуйста, эту строку, '
'тестируйте ниже -->',
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894675
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: I6e98d3061a4ba3089209c8fa7d3ca8763af355ab
Gerrit-Change-Number: 894675
Gerrit-PatchSet: 2
Gerrit-Owner: MarcoAurelio <maurelio(a)toolforge.org>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.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/+/894653 )
Change subject: [IMPR] use f-string instead of format method
......................................................................
[IMPR] use f-string instead of format method
Change-Id: I24e99317d9eabc2cf5cd34eda9f43980e25e2028
---
M pywikibot/site/_basesite.py
1 file changed, 15 insertions(+), 9 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_basesite.py b/pywikibot/site/_basesite.py
index 92b79d7..a13cec7 100644
--- a/pywikibot/site/_basesite.py
+++ b/pywikibot/site/_basesite.py
@@ -316,27 +316,24 @@
try:
name = dp.getSitelink(self)
except NoPageError:
- raise Error(
- 'No disambiguation category name found in {repo} '
- 'for {site}'.format(repo=repo_name, site=self))
+ raise Error(f'No disambiguation category name found in {repo} '
+ f'for {self}')
else: # fallback for non WM sites
try:
name = '{}:{}'.format(Namespace.CATEGORY,
self.family.disambcatname[self.code])
except KeyError:
- raise Error(
- 'No disambiguation category name found in '
- '{site.family.name}_family for {site}'.format(site=self))
+ raise Error(f'No disambiguation category name found in '
+ f'{self.family.name}_family for {self}')
return pywikibot.Category(pywikibot.Link(name, self))
def isInterwikiLink(self, text): # noqa: N802
"""Return True if text is in the form of an interwiki link.
- If a link object constructed using "text" as the link text parses as
- belonging to a different site, this method returns True.
-
+ If a link object constructed using "text" as the link text parses
+ as belonging to a different site, this method returns True.
"""
linkfam, linkcode = pywikibot.Link(text, self).parse_site()
return linkfam != self.family.name or linkcode != self.code
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894653
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: I24e99317d9eabc2cf5cd34eda9f43980e25e2028
Gerrit-Change-Number: 894653
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
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/+/894530 )
Change subject: [tests] Ensure that login is made prior than rights are checked
......................................................................
[tests] Ensure that login is made prior than rights are checked
Bug: T331266
Change-Id: I19bdf4a7db13996a93cfbd8fbe5ad817931ab97c
---
M tests/aspects.py
1 file changed, 16 insertions(+), 3 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/aspects.py b/tests/aspects.py
index 5ab221c..b011986 100644
--- a/tests/aspects.py
+++ b/tests/aspects.py
@@ -601,8 +601,7 @@
@classmethod
def setUpClass(cls):
- """
- Set up the test class.
+ """Set up the test class.
Skip the test class if the user config does not have
a valid login to the site.
@@ -853,12 +852,16 @@
bases = cls.add_base(bases, SiteWriteMixin)
if dct.get('rights'):
- bases = cls.add_base(bases, NeedRightsMixin)
dct.setdefault('login', True)
if dct.get('login'):
bases = cls.add_base(bases, RequireLoginMixin)
+ # Add NeedRightsMixin after RequireLoginMixin to ensure
+ # login is made prior to rights check
+ if dct.get('rights'):
+ bases = cls.add_base(bases, NeedRightsMixin)
+
for test in tests:
test_func = dct[test]
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894530
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: I19bdf4a7db13996a93cfbd8fbe5ad817931ab97c
Gerrit-Change-Number: 894530
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged