jenkins-bot has submitted this change and it was merged.

Change subject: remove obsolete pywikibot.stopme() at the end of some scripts. ......................................................................

remove obsolete pywikibot.stopme() at the end of some 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: I6759a6ad476e4ea6999b987ee1d2057d6165f061 --- M scripts/create_categories.py M scripts/delete.py M scripts/disambredir.py M scripts/editarticle.py 4 files changed, 6 insertions(+), 18 deletions(-)

Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified

diff --git a/scripts/create_categories.py b/scripts/create_categories.py index ae043be..c29edbf 100755 --- a/scripts/create_categories.py +++ b/scripts/create_categories.py @@ -27,7 +27,7 @@ __version__ = '$Id$' # # (C) Multichill, 2011 -# (C) xqt, 2011 +# (C) xqt, 2011-2014 # # Distributed under the terms of the MIT license. # @@ -96,7 +96,4 @@ pywikibot.output(u'All done')

if __name__ == "__main__": - try: - main(sys.argv[1:]) - finally: - pywikibot.stopme() + main(sys.argv[1:]) diff --git a/scripts/delete.py b/scripts/delete.py index 22c4856..90d437c 100644 --- a/scripts/delete.py +++ b/scripts/delete.py @@ -134,7 +134,4 @@

if __name__ == "__main__": - try: - main() - finally: - pywikibot.stopme() + main() diff --git a/scripts/disambredir.py b/scripts/disambredir.py index 0a60870..1983d6a 100644 --- a/scripts/disambredir.py +++ b/scripts/disambredir.py @@ -181,7 +181,4 @@

if __name__ == "__main__": - try: - main() - finally: - pywikibot.stopme() + main() diff --git a/scripts/editarticle.py b/scripts/editarticle.py index d9644e6..21d16ac 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -11,7 +11,7 @@ """ # # (C) Gerrit Holl 2004 -# (C) Pywikibot team, 2004-2013 +# (C) Pywikibot team, 2004-2014 # # Distributed under the terms of the MIT license. # @@ -102,7 +102,4 @@

if __name__ == "__main__": - try: - main() - finally: - pywikibot.stopme() + main()