jenkins-bot has submitted this change and it was merged.
Change subject: fixing typo in exception name
......................................................................
fixing typo in exception name
Change-Id: Ib53e10ab703fb5db490111b490c6bc104a530694
---
M lonelypages.py
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lonelypages.py b/lonelypages.py
index 859bab8..8a8d71c 100644
--- a/lonelypages.py
+++ b/lonelypages.py
@@ -31,7 +31,7 @@
--- Credit and Help ---
This Script has been developed by Pietrodn and Filnik on botwiki. If you want to help us
-improving our script archive and pywikipediabot's archive or you simply need help
+improving our script archive and pywikibot's archive or you simply need help
you can find us here: http://botwiki.sno.cc
--- Examples ---
@@ -40,7 +40,7 @@
#
# (C) Pietrodn, it.wiki 2006-2007
# (C) Filnik, it.wiki 2007
-# (C) Pywikibot team, 2008-2013
+# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the MIT license.
#
@@ -185,7 +185,7 @@
u"%s doesn't esist, I use the page as if it was blank!"
% enable.title())
getenable = ''
- except wikiepedia.IsRedirect:
+ except pywikibot.IsRedirect:
pywikibot.output(u"%s is a redirect, skip!" % enable.title())
getenable = ''
# If the enable page is set to disable, turn off the bot
@@ -201,7 +201,7 @@
except pywikibot.NoPage:
pywikibot.output(u"%s doesn't esist, skip!" % disambigpage.title())
disambigtext = ''
- except wikiepedia.IsRedirect:
+ except pywikibot.IsRedirect:
pywikibot.output(u"%s is a redirect, don't use it!"
% disambigpage.title())
disambigPage = None
--
To view, visit https://gerrit.wikimedia.org/r/105923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib53e10ab703fb5db490111b490c6bc104a530694
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: updating MW version for Vikidia and Wikia
......................................................................
updating MW version for Vikidia and Wikia
Change-Id: Idd31d0b51065e097d6e5c1c5748a24a6084ad9eb
---
M families/vikidia_family.py
M families/wikia_family.py
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Ladsgroup: Looks good to me, approved
jenkins-bot: Verified
diff --git a/families/vikidia_family.py b/families/vikidia_family.py
index d09783d..99f5c30 100644
--- a/families/vikidia_family.py
+++ b/families/vikidia_family.py
@@ -106,7 +106,7 @@
# Which version of MediaWiki is used? REQUIRED
def version(self, code):
# Replace with the actual version being run on your wiki
- return '1.16.0'
+ return '1.22.0'
def code2encoding(self, code):
"""Return the encoding for a specific language wiki"""
diff --git a/families/wikia_family.py b/families/wikia_family.py
index bc39eaf..89df04b 100644
--- a/families/wikia_family.py
+++ b/families/wikia_family.py
@@ -39,7 +39,7 @@
return u'www.wikia.com'
def version(self, code):
- return "1.19.6"
+ return "1.19.9"
def scriptpath(self, code):
return ''
--
To view, visit https://gerrit.wikimedia.org/r/105716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idd31d0b51065e097d6e5c1c5748a24a6084ad9eb
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: Linedwell <Linedwell(a)icloud.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Pyfisch has submitted this change and it was merged.
Change subject: code improvements
......................................................................
code improvements
- check for a valid speedy deletion template on live wiki. The
result is hold in the class container so we need to check only
once.
- use Site instead of Site.lang as key for twn dictionaries
this should also solve that bug pointed out at
https://sourceforge.net/p/pywikipediabot/bugs/1577/
i18n library uses the right code even the key would be changed
from code to lang on twn dict in future or there might be a
fallback from code to lang on i18n library.
- test whether we are logged in as sysop because we have no
exception here like in compat
Change-Id: I39dd03bc04846f129ee20c7959a57e4685e87d94
---
M scripts/redirect.py
1 file changed, 29 insertions(+), 9 deletions(-)
Approvals:
Pyfisch: Verified; Looks good to me, approved
diff --git a/scripts/redirect.py b/scripts/redirect.py
index 0487f2a..d43d0d5 100755
--- a/scripts/redirect.py
+++ b/scripts/redirect.py
@@ -379,6 +379,7 @@
self.number = number
self.delete = delete
self.exiting = False
+ self._valid_template = None
def prompt(self, question):
if not self.always:
@@ -393,6 +394,24 @@
elif choice == 'a':
self.always = True
return True
+
+ def has_valid_template(self, twtitle):
+ """"Check whether a template from translatewiki.net does exist on real
+ wiki. We assume we are always working on self.site
+
+ @param twtitle - a sting which is the i18n key
+
+ """
+ if self._valid_template is None:
+ self._valid_template = False
+ if i18n.twhas_key(self.site, twtitle):
+ template_msg = i18n.twtranslate(self.site, twtitle)
+ template = re.findall(u'.*?{{(.*?)[|}]', template_msg)
+ if template:
+ title = template[0]
+ page = pywikibot.Page(self.site, title, ns=10)
+ self._valid_template = page.exists()
+ return self._valid_template
def delete_broken_redirects(self):
# get reason for deletion text
@@ -476,22 +495,23 @@
redir_page.title(asLink=True))):
reason = i18n.twtranslate(self.site,
'redirect-remove-broken')
- try:
+ if self.site.logged_in(sysop=True):
redir_page.delete(reason, prompt=False)
- except pywikibot.NoUsername:
- if ((i18n.twhas_key(
- targetPage.site.lang,
- 'redirect-broken-redirect-template') and
- i18n.twhas_key(targetPage.site.lang,
- 'redirect-remove-broken')) or
- targetPage.site.lang == '-'):
+ else:
+ assert targetPage.site == self.site, (
+ u'target page is on different site %s'
+ % targetPage.site)
+ if (self.has_valid_template(
+ 'redirect-broken-redirect-template') and
+ i18n.twhas_key(targetPage.site,
+ 'redirect-remove-broken')):
pywikibot.output(u"No sysop in user-config.py, "
u"put page to speedy deletion.")
content = redir_page.get(get_redirect=True)
### TODO: Add bot's signature if needed
### Not supported via TW yet
content = i18n.twtranslate(
- targetPage.site.lang,
+ targetPage.site,
'redirect-broken-redirect-template'
) + "\n" + content
redir_page.put(content, reason)
--
To view, visit https://gerrit.wikimedia.org/r/104811
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I39dd03bc04846f129ee20c7959a57e4685e87d94
Gerrit-PatchSet: 3
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: Huji <huji.huji(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Meno25 <meno25mail(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: Siebrand <siebrand(a)wikimedia.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Pyfisch has submitted this change and it was merged.
Change subject: use insite parameter of Page.title() to format links on target page
......................................................................
use insite parameter of Page.title() to format links on target page
Changing the config settings is no longer needed to get sensible
backlinks. This is follow up for https://gerrit.wikimedia.org/r/#/c/105436/
Additional changes:
- rewrite the documentation tho the common format
- remove the unused -fromfamily -fromlang comments. We may just use
-lang and -family option for the source site
- use the current site paramteters as default for the target site
but raise an exception if both are equal. This means you may
ommit eigther -tolang or -tofamily option.
- DuplicateFilterGenerator is always the last generator we see
for gen. Thus we do not display the generator but the arguments.
Change-Id: I5d4cd6673140ad87f26e884007ffb6d3434ecc56
---
M scripts/transferbot.py
1 file changed, 26 insertions(+), 25 deletions(-)
Approvals:
Pyfisch: Verified; Looks good to me, approved
diff --git a/scripts/transferbot.py b/scripts/transferbot.py
index 8ab1769..1bb5ef9 100644
--- a/scripts/transferbot.py
+++ b/scripts/transferbot.py
@@ -5,15 +5,19 @@
This script transfers pages from a source wiki to a target wiki. It also
copies edit history to a subpage.
-Target site can be specified with -tofamily and -tolang
-Source site can be specified with -fromfamily and -fromlang
-Page prefix on the new site can be specified with -prefix
+-tolang: The target site code.
-Existing pages are skipped by default. Pass -overwrite to overwrite pages.
+-tosite: The target site family.
+
+-prefix: Page prefix on the new site.
+
+-overwrite: Existing pages are skipped by default. Use his option to
+ overwrite pages.
Internal links are *not* repaired!
Pages to work on can be specified using any of:
+
¶ms;
Example commands:
@@ -29,6 +33,7 @@
#
# (C) Merlijn van Deen, 2014
+# (C) pywikibot team, 2014
#
# Distributed under the terms of the MIT license.
#
@@ -46,15 +51,17 @@
fromsite = pywikibot.getSite()
tolang = fromsite.code
- tofamily = None
+ tofamily = fromsite.family.name
prefix = ''
template = None
overwrite = False
+ gen_args = []
genFactory = pagegenerators.GeneratorFactory()
for arg in tohandle:
if genFactory.handleArg(arg):
+ gen_args.append(arg)
continue
if arg.startswith('-tofamily'):
tofamily = arg[len('-tofamily:'):]
@@ -67,33 +74,22 @@
elif arg == "-overwrite":
overwrite = True
+ tosite = pywikibot.Site(tolang, tofamily)
+ if fromsite == tosite:
+ raise Exception('Target site not different from source site')
+
gen = genFactory.getCombinedGenerator()
-
- if not tofamily:
- raise Exception('Target family not specified')
-
- from pywikibot import config
-
- # we change the config family to make sure we get sensible backlinks
- # i.e. [[wikipedia:en:pagename]] instead of [[pagename]]
- # this should really be fixed in Page.title() (bug #59223)
- # we can't do this before, as the pagegenerator would work on the
- # incorrect site...
- config.mylang = tolang
- config.family = tofamily
-
- tosite = pywikibot.Site()
-
if not gen:
raise Exception('Target pages not specified')
+ gen_args = ' '.join(gen_args)
pywikibot.output(u"""
Page transfer configuration
---------------------------
Source: %(fromsite)r
Target: %(tosite)r
- Pages to transfer: %(gen)r
+ Pages to transfer: %(gen_args)s
Prefix for transferred pages: %(prefix)s
""" % locals())
@@ -101,7 +97,8 @@
for page in gen:
summary = "Moved page from %s" % page.title(asLink=True)
targetpage = pywikibot.Page(tosite, prefix + page.title())
- edithistpage = pywikibot.Page(tosite, prefix + page.title() + "/edithistory")
+ edithistpage = pywikibot.Page(tosite, prefix + page.title()
+ + "/edithistory")
if targetpage.exists() and not overwrite:
pywikibot.output(
@@ -112,12 +109,15 @@
)
continue
- pywikibot.output(u"Moving %s to %s..." % (page.title(asLink=True), targetpage.title(asLink=True)))
+ pywikibot.output(u"Moving %s to %s..."
+ % (page.title(asLink=True),
+ targetpage.title(asLink=True)))
pywikibot.log("Getting page text.")
text = page.get(get_redirect=True)
text += "<noinclude>\n\n<small>This page was moved from %s. It's edit history can be viewed at %s</small></noinclude>" % (
- page.title(asLink=True), edithistpage.title(asLink=True))
+ page.title(asLink=True, insite=targetpage.site),
+ edithistpage.title(asLink=True, insite=targetpage.site))
pywikibot.log("Getting edit history.")
historytable = page.getVersionHistoryTable()
@@ -128,6 +128,7 @@
pywikibot.log("Putting edit history.")
edithistpage.put(historytable, comment=summary)
+
if __name__ == "__main__":
try:
main()
--
To view, visit https://gerrit.wikimedia.org/r/105440
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d4cd6673140ad87f26e884007ffb6d3434ecc56
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
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: jenkins-bot
jenkins-bot has submitted this change and it was merged.
Change subject: update of MW version on Vikidia and Wikia
......................................................................
update of MW version on Vikidia and Wikia
Change-Id: Ia6d639097de42e4773731902aa0e535c54fff7ba
---
M pywikibot/families/vikidia_family.py
M pywikibot/families/wikia_family.py
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/families/vikidia_family.py b/pywikibot/families/vikidia_family.py
index 377c998..8f8a598 100644
--- a/pywikibot/families/vikidia_family.py
+++ b/pywikibot/families/vikidia_family.py
@@ -40,7 +40,7 @@
# Which version of MediaWiki is used? REQUIRED
def version(self, code):
# Replace with the actual version being run on your wiki
- return '1.16.0'
+ return '1.22.0'
def code2encoding(self, code):
"""Return the encoding for a specific language wiki"""
diff --git a/pywikibot/families/wikia_family.py b/pywikibot/families/wikia_family.py
index 4830282..0619dd2 100644
--- a/pywikibot/families/wikia_family.py
+++ b/pywikibot/families/wikia_family.py
@@ -20,7 +20,7 @@
return u'www.wikia.com'
def version(self, code):
- return "1.19.6"
+ return "1.19.9"
def scriptpath(self, code):
return ''
--
To view, visit https://gerrit.wikimedia.org/r/105667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d639097de42e4773731902aa0e535c54fff7ba
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Linedwell <Linedwell(a)icloud.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot