Pywikibot-commits March 2014

pywikibot-commits@lists.wikimedia.org

1 participants
107 discussions

[Gerrit] Noisy dots for fixing moved page redirects. - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Noisy dots for fixing moved page redirects. ...................................................................... Noisy dots for fixing moved page redirects. Otherwise you didn't see any action for a long period and cannot check whether the bot works or e.g. hangs. Single dots are printed. Because the print statement prints a space on the end (py 2.X), there has to be a backspace char "\b" in front of the next dot. (unlike compat where you see any retrieved page) Change-Id: Id6ce19608e86b50d1720acb98d010c9b05dcb27e --- M scripts/redirect.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/redirect.py b/scripts/redirect.py index f2eec79..d8451f0 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -348,8 +348,10 @@ move_gen = self.site.logevents(logtype="move", start=offset_time) if self.api_number: move_gen.set_maximum_items(self.api_number) + pywikibot.output('.', newline=False) for logentry in move_gen: moved_page = logentry.title() + pywikibot.output('.', newline=False) try: if not moved_page.isRedirectPage(): continue -- To view, visit https://gerrit.wikimedia.org/r/117654 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6ce19608e86b50d1720acb98d010c9b05dcb27e Gerrit-PatchSet: 3 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: Russell Blau <russblau(a)imapmail.org> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

[Gerrit] remove obsolete pywikibot.stopme() at the end of this script. - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete pywikibot.stopme() at the end of this script. ...................................................................... remove obsolete pywikibot.stopme() at the end of this script. In core branch pywikibot.stopme() is called by atexit library. The function is executed upon normal program termination. This patch prohibits executing it twice. Change-Id: I1dcb7930a47c9c58f867c1710d3b4f4600341dd7 --- M scripts/makecat.py 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/makecat.py b/scripts/makecat.py index c5869ae..eddde36 100644 --- a/scripts/makecat.py +++ b/scripts/makecat.py @@ -296,7 +296,6 @@ loaded -= 1 finally: - pywikibot.stopme() try: excludefile.close() except: -- To view, visit https://gerrit.wikimedia.org/r/120205 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1dcb7930a47c9c58f867c1710d3b4f4600341dd7 Gerrit-PatchSet: 1 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: jenkins-bot <>

10 years, 1 month

[Gerrit] put global script into main(), remove obsolete stopme() call - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: put global script into main(), remove obsolete stopme() call ...................................................................... put global script into main(), remove obsolete stopme() call Change-Id: Ib73400d2703d8dfcfebdfe87189718242631ad1a --- M scripts/welcome.py 1 file changed, 100 insertions(+), 94 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index 5840eb4..b81b474 100644 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -860,102 +860,109 @@ return list_loaded globalvar = Global() +global bot +global filename + + +def main(): + number_user = 0 + for arg in pywikibot.handleArgs(): + if arg.startswith('-edit'): + if len(arg) == 5: + globalvar.attachEditCount = int(pywikibot.input( + u'After how many edits would you like to welcome new users? (0 is allowed)')) + else: + globalvar.attachEditCount = int(arg[6:]) + elif arg.startswith('-timeoffset'): + if len(arg) == 11: + globalvar.timeoffset = int(pywikibot.input( + u'Which time offset (in minutest) for new users would you like to use?')) + else: + globalvar.timeoffset = int(arg[12:]) + elif arg.startswith('-time'): + if len(arg) == 5: + globalvar.timeRecur = int(pywikibot.input( + u'For how many seconds would you like to bot to sleep before checking again?')) + else: + globalvar.timeRecur = int(arg[6:]) + elif arg.startswith('-offset'): + if len(arg) == 7: + globalvar.offset = int(pywikibot.input( + u'Which time offset for new users would you like to use? (yyyymmddhhmmss)')) + else: + globalvar.offset = int(arg[8:]) + if len(str(globalvar.offset)) != 14: + # upon request, we might want to check for software version here + raise ValueError( + "Mediawiki has changed, -offset:# is not supported anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP is yyyymmddhhmmss. -timeoffset is now also supported. Please read this script source header for documentation.") + elif arg.startswith('-file:'): + globalvar.randomSign = True + if len(arg) == 6: + globalvar.signFileName = pywikibot.input( + u'Where have you saved your signatures?') + else: + globalvar.signFileName = arg[6:] + elif arg.startswith('-sign:'): + if len(arg) == 6: + globalvar.defaultSign = pywikibot.input( + u'Which signature to use?') + else: + globalvar.defaultSign = arg[6:] + globalvar.defaultSign += timeselected + elif arg == '-break': + globalvar.recursive = False + elif arg == '-nlog': + globalvar.makeWelcomeLog = False + elif arg == '-ask': + globalvar.confirm = True + elif arg == '-filter': + globalvar.filtBadName = True + #elif arg == '-savedata': + # globalvar.saveSignIndex = True + elif arg == '-random': + globalvar.randomSign = True + elif arg == '-sul': + globalvar.welcomeAuto = True + elif arg.startswith('-limit'): + if len(arg) == 6: + globalvar.queryLimit = int(pywikibot.input( + u'How many of the latest new users would you like to load?')) + else: + globalvar.queryLimit = int(arg[7:]) + elif arg.startswith('-numberlog'): + if len(arg) == 10: + globalvar.dumpToLog = int(pywikibot.input( + u'After how many welcomed users would you like to update the welcome log?')) + else: + globalvar.dumpToLog = int(arg[11:]) + elif arg == '-quiet': + globalvar.quiet = True + elif arg == '-quick': + globalvar.quick = True + + # Filename and pywikipedia path + # file where is stored the random signature index + filename = pywikibot.config.datafilepath('welcome-%s-%s.data' + % (pywikibot.Site().family.name, + pywikibot.Site().code)) + if globalvar.offset and globalvar.timeoffset: + pywikibot.warning( + 'both -offset and -timeoffset were provided, ignoring -offset') + globalvar.offset = 0 + bot = WelcomeBot() + try: + bot.run() + except KeyboardInterrupt: + if bot.welcomed_users: + showStatus() + pywikibot.output("Put welcomed users before quit...") + bot.makelogpage(bot.welcomed_users) + pywikibot.output("\nQuitting...") + if __name__ == "__main__": try: - number_user = 0 - for arg in pywikibot.handleArgs(): - if arg.startswith('-edit'): - if len(arg) == 5: - globalvar.attachEditCount = int(pywikibot.input( - u'After how many edits would you like to welcome new users? (0 is allowed)')) - else: - globalvar.attachEditCount = int(arg[6:]) - elif arg.startswith('-timeoffset'): - if len(arg) == 11: - globalvar.timeoffset = int(pywikibot.input( - u'Which time offset (in minutest) for new users would you like to use?')) - else: - globalvar.timeoffset = int(arg[12:]) - elif arg.startswith('-time'): - if len(arg) == 5: - globalvar.timeRecur = int(pywikibot.input( - u'For how many seconds would you like to bot to sleep before checking again?')) - else: - globalvar.timeRecur = int(arg[6:]) - elif arg.startswith('-offset'): - if len(arg) == 7: - globalvar.offset = int(pywikibot.input( - u'Which time offset for new users would you like to use? (yyyymmddhhmmss)')) - else: - globalvar.offset = int(arg[8:]) - if len(str(globalvar.offset)) != 14: - # upon request, we might want to check for software version here - raise ValueError( - "Mediawiki has changed, -offset:# is not supported anymore, but -offset:TIMESTAMP is, assuming TIMESTAMP is yyyymmddhhmmss. -timeoffset is now also supported. Please read this script source header for documentation.") - elif arg.startswith('-file:'): - globalvar.randomSign = True - if len(arg) == 6: - globalvar.signFileName = pywikibot.input( - u'Where have you saved your signatures?') - else: - globalvar.signFileName = arg[6:] - elif arg.startswith('-sign:'): - if len(arg) == 6: - globalvar.defaultSign = pywikibot.input( - u'Which signature to use?') - else: - globalvar.defaultSign = arg[6:] - globalvar.defaultSign += timeselected - elif arg == '-break': - globalvar.recursive = False - elif arg == '-nlog': - globalvar.makeWelcomeLog = False - elif arg == '-ask': - globalvar.confirm = True - elif arg == '-filter': - globalvar.filtBadName = True - #elif arg == '-savedata': - # globalvar.saveSignIndex = True - elif arg == '-random': - globalvar.randomSign = True - elif arg == '-sul': - globalvar.welcomeAuto = True - elif arg.startswith('-limit'): - if len(arg) == 6: - globalvar.queryLimit = int(pywikibot.input( - u'How many of the latest new users would you like to load?')) - else: - globalvar.queryLimit = int(arg[7:]) - elif arg.startswith('-numberlog'): - if len(arg) == 10: - globalvar.dumpToLog = int(pywikibot.input( - u'After how many welcomed users would you like to update the welcome log?')) - else: - globalvar.dumpToLog = int(arg[11:]) - elif arg == '-quiet': - globalvar.quiet = True - elif arg == '-quick': - globalvar.quick = True - - # Filename and pywikipedia path - # file where is stored the random signature index - filename = pywikibot.config.datafilepath('welcome-%s-%s.data' - % (pywikibot.Site().family.name, - pywikibot.Site().code)) - if globalvar.offset and globalvar.timeoffset: - pywikibot.warning( - 'both -offset and -timeoffset were provided, ignoring -offset') - globalvar.offset = 0 - bot = WelcomeBot() - try: - bot.run() - except KeyboardInterrupt: - if bot.welcomed_users: - showStatus() - pywikibot.output("Put welcomed users before quit...") - bot.makelogpage(bot.welcomed_users) - pywikibot.output("\nQuitting...") + main() finally: # If there is the savedata, the script must save the number_user. if globalvar.randomSign and globalvar.saveSignIndex and \ @@ -964,4 +971,3 @@ f = file(filename, 'w') cPickle.dump(bot.welcomed_users, f) f.close() - pywikibot.stopme() -- To view, visit https://gerrit.wikimedia.org/r/120204 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib73400d2703d8dfcfebdfe87189718242631ad1a 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: jenkins-bot <>

10 years, 1 month

[Gerrit] remove obsolete pywikibot.stopme() at the end of these scripts. - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: remove obsolete pywikibot.stopme() at the end of these scripts. ...................................................................... remove obsolete pywikibot.stopme() at the end of these scripts. In core branch pywikibot.stopme() is called by atexit library. The function is executed upon normal program termination. This patch prohibits executing it twice. Change-Id: I360593a84694877e48ecc76efe163e436b8c1093 --- M tests/date_tests.py M tests/page_tests.py M tests/site_tests.py M tests/timestripper_tests.py M tests/ui_tests.py M tests/wikibase_tests.py 6 files changed, 22 insertions(+), 37 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/date_tests.py b/tests/date_tests.py index 32477ba..5b69bc2 100644 --- a/tests/date_tests.py +++ b/tests/date_tests.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# (C) Pywikipedia bot team, 2014 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # @@ -40,9 +40,6 @@ if __name__ == '__main__': try: - try: - unittest.main() - except SystemExit: - pass - finally: - pywikibot.stopme() + unittest.main() + except SystemExit: + pass diff --git a/tests/page_tests.py b/tests/page_tests.py index d764f68..c6984a7 100644 --- a/tests/page_tests.py +++ b/tests/page_tests.py @@ -3,7 +3,7 @@ Tests for the page module. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # @@ -325,9 +325,6 @@ if __name__ == '__main__': try: - try: - unittest.main() - except SystemExit: - pass - finally: - pywikibot.stopme() + unittest.main() + except SystemExit: + pass diff --git a/tests/site_tests.py b/tests/site_tests.py index 79db3e2..f219522 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -3,7 +3,7 @@ Tests for the site module. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # @@ -1160,9 +1160,6 @@ if __name__ == '__main__': try: - try: - unittest.main() - except SystemExit: - pass - finally: - pywikibot.stopme() + unittest.main() + except SystemExit: + pass diff --git a/tests/timestripper_tests.py b/tests/timestripper_tests.py index fd2ea1d..f828b47 100644 --- a/tests/timestripper_tests.py +++ b/tests/timestripper_tests.py @@ -3,7 +3,7 @@ Tests for archivebot.py/Timestripper. """ # -# (C) Pywikipedia bot team, 2014 +# (C) Pywikibot team, 2014 # # Distributed under the terms of the MIT license. # @@ -64,9 +64,6 @@ if __name__ == '__main__': try: - try: - unittest.main() - except SystemExit: - pass - finally: - pywikibot.stopme() + unittest.main() + except SystemExit: + pass diff --git a/tests/ui_tests.py b/tests/ui_tests.py index b737e33..ad92448 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -3,7 +3,7 @@ Tests for the page module. """ # -# (C) Pywikipedia bot team, 2008 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # @@ -488,7 +488,6 @@ pass finally: unpatch() - pywikibot.stopme() else: class TestTerminalUI(unittest.TestCase): diff --git a/tests/wikibase_tests.py b/tests/wikibase_tests.py index 43116fa..14a5020 100644 --- a/tests/wikibase_tests.py +++ b/tests/wikibase_tests.py @@ -3,11 +3,12 @@ Tests for the Wikidata parts of the page module. """ # -# (C) Pywikipedia bot team, 2008-2013 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # __version__ = '$Id$' +# import os import pywikibot @@ -81,9 +82,6 @@ if __name__ == '__main__': try: - try: - unittest.main() - except SystemExit: - pass - finally: - pywikibot.stopme() + unittest.main() + except SystemExit: + pass -- To view, visit https://gerrit.wikimedia.org/r/120210 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I360593a84694877e48ecc76efe163e436b8c1093 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipedia(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

[Gerrit] with IDLE sometimes we need maintenance as a library - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: with IDLE sometimes we need maintenance as a library ...................................................................... with IDLE sometimes we need maintenance as a library Change-Id: I6c51b64e50918b7926ee8bb1a3835fe22144a8a8 --- A scripts/maintenance/__init__.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/maintenance/__init__.py b/scripts/maintenance/__init__.py new file mode 100644 index 0000000..c47da75 --- /dev/null +++ b/scripts/maintenance/__init__.py @@ -0,0 +1 @@ +# THIS DIRECTORY IS TO HOLD BOT SCRIPTS FOR THE NEW FRAMEWORK -- To view, visit https://gerrit.wikimedia.org/r/120199 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I6c51b64e50918b7926ee8bb1a3835fe22144a8a8 Gerrit-PatchSet: 1 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 <>

10 years, 1 month

[Gerrit] i18n for spamremove.py - change (pywikibot/i18n)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: i18n for spamremove.py ...................................................................... i18n for spamremove.py Change-Id: I93a6598f8681407814dda4cdc15ce85f6b6a145c --- A spamremove.py 1 file changed, 48 insertions(+), 0 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/spamremove.py b/spamremove.py new file mode 100644 index 0000000..60551e3 --- /dev/null +++ b/spamremove.py @@ -0,0 +1,48 @@ +# -*- coding: utf-8 -*- +msg = { + 'ar': { + 'spamremove-remove': u'إزالة الوصلات إلى موقع سبام %(url)s', + }, + 'de': { + 'spamremove-remove': u'Entferne in Spam-Blacklist eingetragenen Weblink auf %(url)s', + }, + 'en': { + 'spamremove-remove': u'Removing links to spamming site %(url)s', + }, + 'es': { + 'spamremove-remove': u'Removiendo enlaces a sitio publicitario %(url)s', + }, + 'fa': { + 'spamremove-remove': u'حذف پیوند به وبگاه هرزنگاری %(url)s', + }, + 'fr': { + 'spamremove-remove': u'Suppression du lien blacklisté %(url)s', + }, + 'he': { + 'spamremove-remove': u'מסיר קישורים לאתר ספאם %(url)s', + }, + 'it': { + 'spamremove-remove': u'Rimuovo link contenuto nella Spam-Blacklist %(url)s', + }, + 'ja': { + 'spamremove-remove': u'ロボットによる: 迷惑リンク削除 %(url)s', + }, + 'nl': { + 'spamremove-remove': u'Links naar gespamde site: %(url)s verwijderd', + }, + 'pt': { + 'spamremove-remove': u'Removendo links de spam do site %(url)s', + }, + 'qqq': { + 'spamremove-remove': u'Edit summary for spamremove report', + }, + 'ta': { + 'spamremove-remove': u'எரிதமாக இணைக்கப்பட்ட %(url)s இணையத்தளம் நீக்கப்பட்டது', + }, + 'vi': { + 'spamremove-remove': u'xóa các liên kết đến website spam %(url)s', + }, + 'zh': { + 'spamremove-remove': u'機器人: 移除廣告黑名單連結 %(url)s', + }, +}; -- To view, visit https://gerrit.wikimedia.org/r/120196 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I93a6598f8681407814dda4cdc15ce85f6b6a145c Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Alex S.H. Lin <alexsh(a)mail2000.com.tw> Gerrit-Reviewer: Andre Engels <andreengels(a)gmail.com> Gerrit-Reviewer: Huji <huji.huji(a)gmail.com> Gerrit-Reviewer: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

[Gerrit] remove old debugging stuff - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: remove old debugging stuff ...................................................................... remove old debugging stuff Change-Id: I7882cf55a99d11d256e3c241b536644b3f2978f0 --- M pagegenerators.py 1 file changed, 0 insertions(+), 4 deletions(-) Approvals: Ladsgroup: Looks good to me, approved jenkins-bot: Verified diff --git a/pagegenerators.py b/pagegenerators.py index 933526a..3908343 100644 --- a/pagegenerators.py +++ b/pagegenerators.py @@ -990,14 +990,12 @@ continue for result in data.results: - #print 'DBG: ', result.URL yield result.URL # give an estimate of pages to work on, but only once. if not estimatedTotalResultsCount: pywikibot.output(u'Estimated total result count: %i pages.' % data.meta.estimatedTotalResultsCount) estimatedTotalResultsCount = data.meta.estimatedTotalResultsCount - #print 'estimatedTotalResultsCount: ', estimatedTotalResultsCount offset += 10 def __iter__(self): @@ -1029,11 +1027,9 @@ while True: try: namespaceNumber, pageName = cursor.fetchone() - print namespaceNumber, pageName except TypeError: # Limit reached or no more results break - #print pageName if pageName: namespace = site.namespace(namespaceNumber) pageName = unicode(pageName, site.encoding()) -- To view, visit https://gerrit.wikimedia.org/r/120037 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7882cf55a99d11d256e3c241b536644b3f2978f0 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

[Gerrit] Don't use SSL if not available - change (pywikibot/compat)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Don't use SSL if not available ...................................................................... Don't use SSL if not available There might still be some installations with httplib without HTTPS for some reason. Don't try to use https on those (in case of Wikipedia, the use of SSL was actually forced). Change-Id: I5809364eb02d8669fc2b62734ca1e3e48824b129 --- M family.py 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/family.py b/family.py index 30e2bed..30d2dbc 100644 --- a/family.py +++ b/family.py @@ -4209,12 +4209,20 @@ return self.namespace(code, 14, all=True) # Methods + def ssl_available(self): + """Check if SSL support is available""" + import httplib + return hasattr(httplib, "HTTPS") + def protocol(self, code): """ Can be overridden to return 'https'. Other protocols are not supported. """ - return 'http%s' % ('', 's')[config.SSL_connection] + if self.ssl_available(): + return 'http%s' % ('', 's')[config.SSL_connection] + else: + return 'http' def hostname(self, code): """The hostname to use for standard http connections.""" @@ -4867,4 +4875,7 @@ return ('commons', 'commons') def protocol(self, code): - return 'https' + if self.ssl_available(): + return 'https' + else: + return 'http' -- To view, visit https://gerrit.wikimedia.org/r/98396 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5809364eb02d8669fc2b62734ca1e3e48824b129 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/compat Gerrit-Branch: master Gerrit-Owner: saper <saper(a)saper.info> 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 <> Gerrit-Reviewer: saper <saper(a)saper.info>

10 years, 1 month

[Gerrit] does_text_contain_section should match preleading ":" in tex... - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: does_text_contain_section should match preleading ":" in textlinks ...................................................................... does_text_contain_section should match preleading ":" in textlinks When a section header contains a text link with preleading colon, it should match it too: == [[This is a section header]] == == [[:This is also a valid section header]] == Additional comments see doc string. Change-Id: Ie52c3956b4d82bb71c2113cbff476c3dec61fa0c --- M pywikibot/textlib.py 1 file changed, 20 insertions(+), 3 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 725d676..fdcda92 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -7,7 +7,7 @@ """ # -# (C) Pywikibot team, 2008-2013 +# (C) Pywikibot team, 2008-2014 # # Distributed under the terms of the MIT license. # @@ -1104,8 +1104,25 @@ #---------------------------------- def does_text_contain_section(pagetext, section): - section = re.sub(r'\\[ _]', '[ _]', re.escape(section)) - """Determines whether the page text contains the given section title.""" + """ + Determines whether the page text contains the given section title. + + @param pagetext: The wikitext of a page + @type text: unicode or string + @param section: a section of a page including wikitext markups + @type section: unicode or string + + Note: It does not care whether a section string may contain spaces or + underlines. Both will match. + If a section parameter contains a internal link, it will match the + section with or without a preleading colon which is required for a + text link e.g. for categories and files. + + """ + # match preleading colon for text links + section = re.sub(r'\\\[\\\[(\\\:)?', '\[\[\:?', re.escape(section)) + # match underscores and white spaces + section = re.sub(r'\\[ _]', '[ _]', section) m = re.search("=+[ ']*%s[ ']*=+" % section, pagetext) return bool(m) -- To view, visit https://gerrit.wikimedia.org/r/114987 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie52c3956b4d82bb71c2113cbff476c3dec61fa0c Gerrit-PatchSet: 3 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: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

[Gerrit] Extended CategoryMoveRobot to remove categories. - change (pywikibot/core)

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. Change subject: Extended CategoryMoveRobot to remove categories. ...................................................................... Extended CategoryMoveRobot to remove categories. In the next step the CategoryRemoveRobot will be merged with the CategoryMoveRobot. Change-Id: Ib26e7541fd13b06d92261ddbb2b912a854200ab1 --- M scripts/category.py 1 file changed, 44 insertions(+), 25 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/category.py b/scripts/category.py index f83d9e3..3b174e8 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -389,8 +389,9 @@ class CategoryMoveRobot(object): - """Bot to move pages from one category to another. The bot - moves pages and subcategories. + """Bot to move pages from one category to another or to remove + pages from categories. The bot moves per default pages and + subcategories. """ @deprecate_arg("oldCatTitle", "oldcat") @deprecate_arg("newCatTitle", "newcat") @@ -401,9 +402,9 @@ @deprecate_arg("deleteEmptySourceCat", "delete_oldcat") @deprecate_arg("titleRegex", "title_regex") @deprecate_arg("withHistory", "history") - def __init__(self, oldcat, newcat, batch=False, comment='', inplace=False, - move_oldcat=True, delete_oldcat=True, title_regex=None, - history=False): + def __init__(self, oldcat, newcat=None, batch=False, comment='', + inplace=False, move_oldcat=True, delete_oldcat=True, + title_regex=None, history=False, pagesonly=False): """Stores all given parameters in the objects attributes. @param oldcat: The move source. @@ -420,13 +421,18 @@ matches the regex are moved. @param history: If True the history of the oldcat is posted on the talkpage of newcat. + @param pagesonly: If True only move pages, not subcategories. """ self.site = pywikibot.Site() # Create attributes for the categories and their talk pages. self.oldcat = self._makecat(oldcat) self.oldtalk = self.oldcat.toggleTalkPage() - self.newcat = self._makecat(newcat) - self.newtalk = self.newcat.toggleTalkPage() + if newcat: + self.newcat = self._makecat(newcat) + self.newtalk = self.newcat.toggleTalkPage() + else: + self.newcat = None + self.newtalk = None # Set boolean settings. self.inplace = inplace self.move_oldcat = move_oldcat @@ -434,42 +440,55 @@ self.batch = batch self.title_regex = title_regex self.history = history + self.pagesonly = pagesonly # Set edit summary for changed pages. self.comment = comment if not self.comment: - template_vars = {'oldcat': self.oldcat.title(withNamespace=False), - 'newcat': self.newcat.title(withNamespace=False)} - self.comment = i18n.twtranslate(self.site, - 'category-replacing', - template_vars) + if self.newcat: + template_vars = { \ + 'oldcat': self.oldcat.title( + withNamespace=False), + 'newcat': self.newcat.title( + withNamespace=False)} + self.comment = i18n.twtranslate(self.site, + 'category-replacing', + template_vars) + else: + template_vars = {'oldcat': self.oldcat.title( \ + withNamespace=False)} + self.comment = i18n.twtranslate(self.site, + 'category-removing', + template_vars) def run(self): """The main bot function that does all the work. For readability it is splitted into several helper functions. """ - if self.move_oldcat and not self.newcat.exists(): + if self.newcat and self.move_oldcat and not self.newcat.exists(): self._movecat() self._movetalk() if self.history: self._hist() self._change(pagegenerators.CategorizedPageGenerator(self.oldcat)) - self._change(pagegenerators.SubCategoriesPageGenerator(self.oldcat)) - self._delete() + if not pagesonly: + self._change(pagegenerators.SubCategoriesPageGenerator( \ + self.oldcat)) + if self.oldcat.isEmptyCategory() and self.delete_oldcat and \ + ((self.newcat and self.move_oldcat) or not self.newcat): + self._delete() def _delete(self): """Private function to delete the category page and its talk page. Do not use this function from outside the class. """ - if self.move_oldcat and self.oldcat.isEmptyCategory() and \ - self.delete_oldcat: - template_vars = {'newcat': self.newcat.title(withNamespace=False), - 'title': self.newcat.title(withNamespace=False)} - comment = i18n.twtranslate(self.site, - 'category-was-moved', - template_vars) - self.oldcat.delete(comment, not self.batch, mark=True) - if self.oldtalk.exists(): - self.oldtalk.delete(comment, not self.batch, mark=True) + template_vars = {'newcat': self.newcat.title(withNamespace=False), + 'title': self.newcat.title(withNamespace=False)} + comment = i18n.twtranslate(self.site, + 'category-was-moved', + template_vars) + self.oldcat.delete(comment, not self.batch, mark=True) + if self.oldtalk.exists(): + self.oldtalk.delete(comment, not self.batch, mark=True) def _change(self, gen): """Private function to move category contents. -- To view, visit https://gerrit.wikimedia.org/r/110873 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib26e7541fd13b06d92261ddbb2b912a854200ab1 Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Pyfisch <pyfisch(a)gmail.com> Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot <>

10 years, 1 month

← Newer
1
2
3
4
5
6
7
...
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits March 2014