jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/407923 )
Change subject: [IMPR] Assign result templatesWithParams() to variables
......................................................................
[IMPR] Assign result templatesWithParams() to variables
Change-Id: Iea43ca567161da5e6f763822e73091b9f5740079
---
M pywikibot/page.py
1 file changed, 11 insertions(+), 9 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index e44f393..b2f1888 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -850,7 +850,7 @@
return False
if not hasattr(self, "_catredirect"):
catredirs = self.site.category_redirects()
- for (template, args) in self.templatesWithParams():
+ for template, args in self.templatesWithParams():
if template.title(withNamespace=False) in catredirs:
# Get target (first template argument)
try:
@@ -1175,30 +1175,32 @@
# go through all templates and look for any restriction
# multiple bots/nobots templates are allowed
- for template in templates:
- title = template[0].title(withNamespace=False)
+ for template, params in templates:
+ title = template.title(withNamespace=False)
if title == 'Nobots':
- if len(template[1]) == 0:
+ if not params:
return False
else:
- bots = template[1][0].split(',')
+ bots = params[0].split(',')
if 'all' in bots or pywikibot.calledModuleName() in bots \
or username in bots:
return False
elif title == 'Bots':
- if len(template[1]) == 0:
+ if not params:
return True
else:
- (ttype, bots) = template[1][0].split('=', 1)
+ (ttype, bots) = params[0].split('=', 1)
bots = bots.split(',')
if ttype == 'allow':
return 'all' in bots or username in bots
if ttype == 'deny':
return not ('all' in bots or username in bots)
if ttype == 'allowscript':
- return 'all' in bots or pywikibot.calledModuleName()
in bots
+ return ('all' in bots
+ or pywikibot.calledModuleName() in bots)
if ttype == 'denyscript':
- return not ('all' in bots or
pywikibot.calledModuleName() in bots)
+ return not ('all' in bots
+ or pywikibot.calledModuleName() in bots)
# no restricting template found
return True
--
To view, visit https://gerrit.wikimedia.org/r/407923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Iea43ca567161da5e6f763822e73091b9f5740079
Gerrit-Change-Number: 407923
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: Dalba <dalba.w...@gmail.com>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
