jenkins-bot has submitted this change and it was merged.
Change subject: remove obsolete pywikibot.stopme() at the end these scripts.
......................................................................
remove obsolete pywikibot.stopme() at the end 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: I7f8f33bf9ca9cb096af454aace6b0c14528773f6
---
M scripts/imagetransfer.py
M scripts/imageuncat.py
M scripts/interwiki.py
M scripts/isbn.py
M scripts/listpages.py
M scripts/login.py
M scripts/lonelypages.py
M scripts/misspelling.py
M scripts/noreferences.py
M scripts/nowcommons.py
M scripts/pagefromfile.py
M scripts/protect.py
M scripts/reflinks.py
M scripts/replace.py
M scripts/revertbot.py
M scripts/solve_disambiguation.py
M scripts/template.py
M scripts/transferbot.py
M scripts/unusedfiles.py
M scripts/upload.py
M scripts/weblinkchecker.py
21 files changed, 38 insertions(+), 98 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py
index 65b8fe4..b2dd90d 100644
--- a/scripts/imagetransfer.py
+++ b/scripts/imagetransfer.py
@@ -26,7 +26,7 @@
"""
#
# (C) Andre Engels, 2004
-# (C) Pywikipedia bot team, 2004-2012
+# (C) Pywikibot team, 2004-2014
#
# Distributed under the terms of the MIT license.
#
@@ -372,7 +372,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/imageuncat.py b/scripts/imageuncat.py
index 2627284..2396261 100755
--- a/scripts/imageuncat.py
+++ b/scripts/imageuncat.py
@@ -7,6 +7,7 @@
"""
#
# (C) Multichill 2008
+# (C) Pywikibot team, 2009-2014
#
# Distributed under the terms of the MIT license.
#
@@ -1365,7 +1366,4 @@
addUncat(page)
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 7f1ceb2..a1eb9f8 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -335,7 +335,7 @@
# (C) Rob W.W. Hooft, 2003
# (C) Daniel Herding, 2004
# (C) Yuri Astrakhan, 2005-2006
-# (C) xqt, 2009-2013
+# (C) xqt, 2009-2014
# (C) Pywikibot team, 2007-2013
#
# Distributed under the terms of the MIT license.
@@ -2601,7 +2601,4 @@
globalvar = Global()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/isbn.py b/scripts/isbn.py
index db1ed49..3e6a722 100755
--- a/scripts/isbn.py
+++ b/scripts/isbn.py
@@ -1520,7 +1520,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/listpages.py b/scripts/listpages.py
index 911e74d..8a4476c 100644
--- a/scripts/listpages.py
+++ b/scripts/listpages.py
@@ -13,7 +13,7 @@
¶ms;
"""
#
-# (C) Pywikibot team, 2008-2013
+# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the MIT license.
#
@@ -42,7 +42,4 @@
pywikibot.showHelp()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/login.py b/scripts/login.py
index fba9eb1..6de961e 100755
--- a/scripts/login.py
+++ b/scripts/login.py
@@ -48,7 +48,7 @@
"""
#
# (C) Rob W.W. Hooft, 2003
-# (C) Pywikibot team, 2003-2012
+# (C) Pywikibot team, 2003-2014
#
# Distributed under the terms of the MIT license.
#
@@ -113,7 +113,4 @@
pywikibot.output(u'%s.%s is not a valid site, please remove it'
u' from your config' % (lang, familyName))
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py
index b5ce898..579199e 100644
--- a/scripts/lonelypages.py
+++ b/scripts/lonelypages.py
@@ -42,7 +42,7 @@
#
# (C) Pietrodn, it.wiki 2006-2007
# (C) Filnik, it.wiki 2007
-# (C) Pywikipedia bot team, 2008-2012
+# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the MIT license.
#
@@ -257,7 +257,4 @@
continue
if __name__ == '__main__':
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/misspelling.py b/scripts/misspelling.py
index 90fa226..62bb918 100644
--- a/scripts/misspelling.py
+++ b/scripts/misspelling.py
@@ -137,7 +137,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index 38265f2..d8e47ef 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -34,7 +34,7 @@
a list of affected articles
"""
#
-# (C) Pywikibot team, 2007-2013
+# (C) Pywikibot team, 2007-2014
#
# Distributed under the terms of the MIT license.
#
@@ -723,7 +723,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/nowcommons.py b/scripts/nowcommons.py
index 79b6c2e..e92d84a 100644
--- a/scripts/nowcommons.py
+++ b/scripts/nowcommons.py
@@ -48,8 +48,8 @@
#
# (C) Wikipedian, 2006-2007
# (C) Siebrand Mazeland, 2007-2008
-# (C) xqt, 2010-2012
-# (C) Pywikipedia bot team, 2006-2013
+# (C) xqt, 2010-2014
+# (C) Pywikibot team, 2006-2013
#
# Distributed under the terms of the MIT license.
#
@@ -463,7 +463,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index fa0e364..cd0c83d 100644
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -42,7 +42,7 @@
"""
#
# (C) Andre Engels, 2004
-# (C) Pywikipedia bot team, 2005-2010
+# (C) Pywikibot team, 2005-2014
#
# Distributed under the terms of the MIT license.
#
@@ -353,7 +353,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/protect.py b/scripts/protect.py
index 7ed203f..7642c62 100644
--- a/scripts/protect.py
+++ b/scripts/protect.py
@@ -195,7 +195,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/reflinks.py b/scripts/reflinks.py
index 986bfd9..430fb34 100644
--- a/scripts/reflinks.py
+++ b/scripts/reflinks.py
@@ -32,7 +32,7 @@
get pdfinfo)
"""
# (C) 2008 - Nicolas Dumazet ( en:User:NicDumZ )
-# (C) Pywikipedia bot team, 2008-2013
+# (C) Pywikibot team, 2008-2014
#
# Distributed under the terms of the GPL
#
@@ -842,7 +842,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/replace.py b/scripts/replace.py
index 5a32c3a..4d8714a 100755
--- a/scripts/replace.py
+++ b/scripts/replace.py
@@ -116,6 +116,7 @@
"""
#
# (C) Daniel Herding & the Pywikipedia team, 2004-2012
+# (C) Pywikibot team, 2009-2014
#
# Distributed under the terms of the MIT license.
#
@@ -693,7 +694,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/revertbot.py b/scripts/revertbot.py
index 9ac1efb..3fc19f4 100644
--- a/scripts/revertbot.py
+++ b/scripts/revertbot.py
@@ -4,7 +4,7 @@
"""
#
# (C) Bryan Tong Minh, 2008
-# (C) Pywikipedia bot team, 2008-2013
+# (C) Pywikibot team, 2008-2014
#
# Ported by Geoffrey "GEOFBOT" Mon - User:Sn1per
# for Google Code-In 2013
@@ -111,7 +111,4 @@
bot.revert_contribs()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index c2bd138..9a65328 100644
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -72,7 +72,7 @@
# (C) Daniel Herding, 2004
# (C) Andre Engels, 2003-2004
# (C) WikiWichtel, 2004
-# (C) Pywikibot team, 2003-2013
+# (C) Pywikibot team, 2003-2014
#
# Distributed under the terms of the MIT license.
#
@@ -1105,7 +1105,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/template.py b/scripts/template.py
index 843965d..d300319 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -99,7 +99,7 @@
#
# (C) Daniel Herding, 2004
# (C) Rob W.W. Hooft, 2003-2005
-# (C) xqt, 2009-2013
+# (C) xqt, 2009-2014
# (C) Pywikibot team, 2004-2013
#
# Distributed under the terms of the MIT license.
@@ -380,5 +380,3 @@
main()
except Exception:
pywikibot.error("Fatal error:", exc_info=True)
- finally:
- pywikibot.stopme()
diff --git a/scripts/transferbot.py b/scripts/transferbot.py
index b996396..15a9910 100644
--- a/scripts/transferbot.py
+++ b/scripts/transferbot.py
@@ -129,7 +129,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/unusedfiles.py b/scripts/unusedfiles.py
index 265d092..690205d 100644
--- a/scripts/unusedfiles.py
+++ b/scripts/unusedfiles.py
@@ -13,7 +13,7 @@
#
# (C) Leonardo Gregianin, 2007
# (C) Filnik, 2008
-# (c) xqt, 2011
+# (c) xqt, 2011-2014
#
# Distributed under the terms of the MIT license.
#
@@ -125,7 +125,4 @@
# msg2uploader = msg2uploader.encode("utf-8")
appendtext(usertalkpage, msg2uploader)
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/upload.py b/scripts/upload.py
index c1a15b6..322984a 100755
--- a/scripts/upload.py
+++ b/scripts/upload.py
@@ -20,7 +20,7 @@
"""
#
# (C) Rob W.W. Hooft, Andre Engels 2003-2004
-# (C) Pywikibot team, 2003-2010
+# (C) Pywikibot team, 2003-2014
#
# Distributed under the terms of the MIT license.
#
@@ -272,7 +272,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py
index 8843286..de5b86d 100644
--- a/scripts/weblinkchecker.py
+++ b/scripts/weblinkchecker.py
@@ -93,7 +93,7 @@
#
# (C) Daniel Herding, 2005
-# (C) Pywikibot team, 2005-2013
+# (C) Pywikibot team, 2005-2014
#
# Distributed under the terms of the MIT license.
#
@@ -901,7 +901,4 @@
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
--
To view, visit https://gerrit.wikimedia.org/r/120193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f8f33bf9ca9cb096af454aace6b0c14528773f6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: DrTrigon <dr.tri...@surfeu.ch>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhall...@arctus.nl>
Gerrit-Reviewer: Pyfisch <pyfi...@gmail.com>
Gerrit-Reviewer: Russell Blau <russb...@imapmail.org>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
