jenkins-bot has submitted this change and it was merged.
Change subject: [BUGFIX] add missing parameter to handle_edit_conflict() method ......................................................................
[BUGFIX] add missing parameter to handle_edit_conflict() method
Change-Id: I22d51d285f120131fc837b16fa361df2157cbcde --- M scripts/editarticle.py 1 file changed, 3 insertions(+), 2 deletions(-)
Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified
diff --git a/scripts/editarticle.py b/scripts/editarticle.py index e6e74ab..d9644e6 100755 --- a/scripts/editarticle.py +++ b/scripts/editarticle.py @@ -11,7 +11,7 @@ """ # # (C) Gerrit Holl 2004 -# (C) Pywikibot team, 2004-2012 +# (C) Pywikibot team, 2004-2013 # # Distributed under the terms of the MIT license. # @@ -66,7 +66,7 @@ if not self.options.edit_redirect and self.page.isRedirectPage(): self.page = self.page.getRedirectTarget()
- def handle_edit_conflict(self): + def handle_edit_conflict(self, new): fn = os.path.join(tempfile.gettempdir(), self.page.title()) fp = open(fn, 'w') fp.write(new) @@ -100,6 +100,7 @@ app = ArticleEditor(*args) app.run()
+ if __name__ == "__main__": try: main()