jenkins-bot has submitted this change and it was merged.
Change subject: (bug 62248) Do not try to fix double redirects if the redirect source is the redirect sample from the tool bar.
......................................................................
(bug 62248) Do not try to fix double redirects if the redirect
source is the redirect sample from the tool bar.
Change-Id: I6f48d363c085ab60c6f9da89fd6bdf661c3427c3
---
M redirect.py
1 file changed, 7 insertions(+), 8 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/redirect.py b/redirect.py
index ba411e6..f75a352 100644
--- a/redirect.py
+++ b/redirect.py
@@ -595,20 +595,19 @@
pywikibot.output(
u' Links to: %s.'
% targetPage.title(asLink=True))
- if targetPage.site.sitename() == 'wikipedia:en':
- mw_msg = targetPage.site.mediawiki_message(
- 'wikieditor-toolbar-tool-redirect-example')
- if targetPage.title() == mw_msg:
- pywikibot.output(
- u"Skipping toolbar example: Redirect source is "
- u"potentially vandalized.")
- break
if targetPage.site != self.site:
pywikibot.warning(
u'redirect target (%s) is on a different site.'
% targetPage.title(asLink=True))
if self.always:
break # skip if automatic
+ mw_msg = targetPage.site.mediawiki_message(
+ 'wikieditor-toolbar-tool-redirect-example')
+ if targetPage.title() == mw_msg:
+ pywikibot.output(
+ u"Skipping toolbar example: Redirect source is "
+ u"potentially vandalized.")
+ break
# watch out for redirect loops
if redirList.count(u'%s:%s'
% (targetPage.site.lang,
--
To view, visit https://gerrit.wikimedia.org/r/116933
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6f48d363c085ab60c6f9da89fd6bdf661c3427c3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw>
Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch>
Gerrit-Reviewer: Huji <huji.huji(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: (bug 62248) Update from compat: Do not try to fix double redirects if the redirect source is the redirect sample from the tool bar.
......................................................................
(bug 62248) Update from compat: Do not try to fix double redirects
if the redirect source is the redirect sample from the tool bar.
Change-Id: I29cfb72ffcbad0d61fb7ec6cd7c2dceee875eb71
---
M scripts/redirect.py
1 file changed, 7 insertions(+), 8 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/redirect.py b/scripts/redirect.py
index c50da8d..2bfae04 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -601,20 +601,19 @@
pywikibot.output(
u' Links to: %s.'
% targetPage.title(asLink=True))
- if targetPage.site.sitename() == 'wikipedia:en':
- mw_msg = targetPage.site.mediawiki_message(
- 'wikieditor-toolbar-tool-redirect-example')
- if targetPage.title() == mw_msg:
- pywikibot.output(
- u"Skipping toolbar example: Redirect source is "
- u"potentially vandalized.")
- break
if targetPage.site != self.site:
pywikibot.warning(
u'redirect target (%s) is on a different site.'
% targetPage.title(asLink=True))
if self.always:
break # skip if automatic
+ mw_msg = targetPage.site.mediawiki_message(
+ 'wikieditor-toolbar-tool-redirect-example')
+ if targetPage.title() == mw_msg:
+ pywikibot.output(
+ u"Skipping toolbar example: Redirect source is "
+ u"potentially vandalized.")
+ break
# watch out for redirect loops
if redirList.count(u'%s:%s'
% (targetPage.site.lang,
--
To view, visit https://gerrit.wikimedia.org/r/116934
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29cfb72ffcbad0d61fb7ec6cd7c2dceee875eb71
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw>
Gerrit-Reviewer: DrTrigon <dr.trigon(a)surfeu.ch>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Pyfisch <pyfisch(a)gmail.com>
Gerrit-Reviewer: Russell Blau <russblau(a)imapmail.org>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: update mw version 1.23wmf16
......................................................................
update mw version 1.23wmf16
Change-Id: I10a59bb639959237595d5ebc0f6bd10db3c6f420
---
M pywikibot/family.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/family.py b/pywikibot/family.py
index 70619c3..4688802 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -1065,7 +1065,7 @@
"""Return Wikimedia projects version number as a string."""
# Don't use this, use versionnumber() instead. This only exists
# to not break family files.
- return '1.23wmf15'
+ return '1.23wmf16'
def shared_image_repository(self, code):
return ('commons', 'commons')
--
To view, visit https://gerrit.wikimedia.org/r/117401
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I10a59bb639959237595d5ebc0f6bd10db3c6f420
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
Xqt has submitted this change and it was merged.
Change subject: redirect.py define exceptions before using it
......................................................................
redirect.py define exceptions before using it
Change-Id: I9db47726096ddb1b9ab0f8928c5a2c65215934fb
---
M scripts/redirect.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Nullzero: Looks good to me, but someone else must approve
Xqt: Verified; Looks good to me, approved
diff --git a/scripts/redirect.py b/scripts/redirect.py
index ed1fc16..c50da8d 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -444,7 +444,7 @@
else:
try:
targetPage.get()
- except pywikibot.BadTitle:
+ except pywikibot.BadTitle as e:
pywikibot.warning(
u'Redirect target %s is not a valid page title.'
% str(e)[10:])
--
To view, visit https://gerrit.wikimedia.org/r/116296
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9db47726096ddb1b9ab0f8928c5a2c65215934fb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Hashar <hashar(a)free.fr>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Nullzero <nullzero.free(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>