jenkins-bot has submitted this change and it was merged.
Change subject: remove obsolete pywikibot.stopme() at the end of some other
scripts.
......................................................................
remove obsolete pywikibot.stopme() at the end of some other 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: Id6881a166b0e7032a78c09654dd1e6d5a5649590
---
M scripts/fixing_redirects.py
M scripts/image.py
2 files changed, 7 insertions(+), 10 deletions(-)
Approvals:
Merlijn van Deen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/fixing_redirects.py b/scripts/fixing_redirects.py
index c89d6db..ff105bc 100644
--- a/scripts/fixing_redirects.py
+++ b/scripts/fixing_redirects.py
@@ -16,7 +16,7 @@
#
# This script based on disambredir.py and solve_disambiguation.py
#
-# (C) Pywikipedia team, 2004-2012
+# (C) Pywikipedia team, 2004-2014
#
# Distributed under the terms of the MIT license.
#
@@ -224,7 +224,4 @@
pywikibot.showHelp('fixing_redirects')
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
diff --git a/scripts/image.py b/scripts/image.py
index d041736..fe50f48 100644
--- a/scripts/image.py
+++ b/scripts/image.py
@@ -34,9 +34,12 @@
python image.py Flag.jpg Flag.svg
"""
-__version__ = '$Id$'
+#
+# (C) Pywikibot team, 2013-2014
#
# Distributed under the terms of the MIT license.
+#
+__version__ = '$Id$'
#
import pywikibot
import replace
@@ -197,7 +200,4 @@
bot.run()
if __name__ == "__main__":
- try:
- main()
- finally:
- pywikibot.stopme()
+ main()
--
To view, visit https://gerrit.wikimedia.org/r/120035
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id6881a166b0e7032a78c09654dd1e6d5a5649590
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
