jenkins-bot submitted this change.

View Change

Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
[IMPR] decrease nested flow statements in blockpageschecker.py

Change-Id: I667713472083cf114bb77a6f97be9f4108f593e0
---
M scripts/blockpageschecker.py
1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/scripts/blockpageschecker.py b/scripts/blockpageschecker.py
index 9420fc2..79f56a3 100755
--- a/scripts/blockpageschecker.py
+++ b/scripts/blockpageschecker.py
@@ -308,10 +308,7 @@
'"template_total_protection"'
.format(self.site.sitename))

- if tu:
- replacement = '|'.join(ttp + tsp + tu)
- else:
- replacement = '|'.join(ttp + tsp)
+ replacement = '|'.join(ttp + tsp + (tu or ''))
text, changes = re.subn(
'<noinclude>({})</noinclude>'.format(replacement),
'', text)
@@ -342,12 +339,8 @@
pywikibot.output(
'The page is protected to the sysop, but the template '
'seems not correct. Fixing...')
- if tu:
- text, changes = re.subn(
- template_in_page.regex, tnr[4], text)
- else:
- text, changes = re.subn(
- template_in_page.regex, tnr[1], text)
+ text, changes = re.subn(
+ template_in_page.regex, tnr[(1, 4)[bool(tu)]], text)
msg_type = template_in_page.msgtype

elif tsp or tu:
@@ -368,12 +361,8 @@
pywikibot.output(
'The page is editable only for the autoconfirmed '
'users, but the template seems not correct. Fixing...')
- if tu:
- text, changes = re.subn(
- template_in_page.regex, tnr[4], text)
- else:
- text, changes = re.subn(
- template_in_page.regex, tnr[0], text)
+ text, changes = re.subn(
+ template_in_page.regex, tnr[(0, 4)[bool(tu)]], text)
msg_type = template_in_page.msgtype

if not changes:
@@ -390,10 +379,7 @@
pywikibot.output('The page is movable for all, deleting '
'the template...')
# Deleting the template because the page doesn't need it.
- if tu:
- replacement = '|'.join(tsmp + ttmp + tu)
- else:
- replacement = '|'.join(tsmp + ttmp)
+ replacement = '|'.join(tsmp + ttmp + (tu or ''))
text, changes = re.subn(
'<noinclude>({})</noinclude>'.format(replacement),
'', text)
@@ -414,12 +400,8 @@
pywikibot.output(
'The page is protected from moving to the sysop, '
'but the template seems not correct. Fixing...')
- if tu:
- text, changes = re.subn(
- template_in_page.regex, tnr[4], text)
- else:
- text, changes = re.subn(
- template_in_page.regex, tnr[3], text)
+ text, changes = re.subn(
+ template_in_page.regex, tnr[3 + bool(tu)], text)
msg_type = template_in_page.msgtype

elif tsmp or tu:
@@ -436,12 +418,8 @@
'The page is movable only for the autoconfirmed '
'users, but the template seems not correct. '
'Fixing...')
- if tu:
- text, changes = re.subn(
- template_in_page.regex, tnr[4], text)
- else:
- text, changes = re.subn(
- template_in_page.regex, tnr[2], text)
+ text, changes = re.subn(template_in_page.regex,
+ tnr[(2, 4)[bool(tu)]], text)
msg_type = template_in_page.msgtype

if not changes:

To view, visit change 772814. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I667713472083cf114bb77a6f97be9f4108f593e0
Gerrit-Change-Number: 772814
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged