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
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894208 )
Change subject: [bugfix] load page info when creating a page if not updated previously
......................................................................
[bugfix] load page info when creating a page if not updated previously
If pageid was retrieved and the page was created after that,
the new pageid is not updated and remains 0. Therefore call
site.loadpageinfo in such case.
Bug: T330980
Change-Id: I6a867da59dda24e0387db556edda85a92d570cca
---
M pywikibot/page/_basepage.py
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Bináris: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page/_basepage.py b/pywikibot/page/_basepage.py
index 2dc891a..8a7374e 100644
--- a/pywikibot/page/_basepage.py
+++ b/pywikibot/page/_basepage.py
@@ -1291,6 +1291,10 @@
if not quiet:
pywikibot.warning(f'Page {link} not saved')
raise PageSaveRelatedError(self)
+
+ if not self.pageid:
+ self.site.loadpageinfo(self)
+
if not quiet:
pywikibot.info(f'Page {link} saved')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/894208
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: I6a867da59dda24e0387db556edda85a92d570cca
Gerrit-Change-Number: 894208
Gerrit-PatchSet: 1
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