jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1202702?usp=email )
Change subject: [IMPR] remove complex binary expressions in interwiki.Subject
......................................................................
[IMPR] remove complex binary expressions in interwiki.Subject
Change-Id: If0c9b098d3ea8569f83d219fdf1dd713403d6f86
---
M scripts/interwiki.py
1 file changed, 15 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 7b72664..200a083 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -679,6 +679,15 @@
# default site for -localonly option
self.site = pywikibot.Site()
+ @staticmethod
+ def is_not_redirect(page):
+ """Check whether *page* is not a redirect page.
+
+ .. versionadded:: 11.0
+ """
+ return page.exists() and not (page.isRedirectPage()
+ or page.isCategoryRedirect())
+
def getFoundDisambig(self, site):
"""Return the first disambiguation found.
@@ -703,10 +712,7 @@
"""
for tree in [self.done, self.pending]:
for page in tree.filter(site):
- if page.exists() \
- and not page.isDisambig() \
- and not page.isRedirectPage() \
- and not page.isCategoryRedirect():
+ if self.is_not_redirect(page) and not page.isDisambig():
return page
return None
@@ -724,9 +730,7 @@
# do.
if self.origin \
and page.namespace() == self.origin.namespace() \
- and page.exists() \
- and not page.isRedirectPage() \
- and not page.isCategoryRedirect():
+ and self.is_not_redirect(page):
return page
return None
@@ -1021,13 +1025,13 @@
def askForHints(self, counter) -> None:
"""Ask for hints to other sites."""
- if (not self.workonme # we don't work on it anyway
+ if (
+ not self.workonme # we don't work on it anyway
or not self.untranslated and not self.conf.askhints
or self.hintsAsked
or not self.origin
- or not self.origin.exists()
- or self.origin.isRedirectPage()
- or self.origin.isCategoryRedirect()):
+ or not self.is_not_redirect(self.origin)
+ ):
return
self.hintsAsked = True
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1202702?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: If0c9b098d3ea8569f83d219fdf1dd713403d6f86
Gerrit-Change-Number: 1202702
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Matěj Suchánek <[email protected]>
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
