X-Git-Url: https://projects.mako.cc/source/mw/blobdiff_plain/b2ea0656229ec22cd65777537ddee6ae59d2c0b7..29ba1dd35ffcafe1cbd2842fbca15f2ad30238ff:/src/mw/clicommands.py diff --git a/src/mw/clicommands.py b/src/mw/clicommands.py index ee863b1..c4b016a 100644 --- a/src/mw/clicommands.py +++ b/src/mw/clicommands.py @@ -38,11 +38,6 @@ class CommandBase(object): self.parser = OptionParser(usage=usage, description=description) self.name = name self.metadir = mw.metadir.Metadir() - #global_options = OptionGroup(self.parser, "Global Options") - #global_options.add_option('-u', '--use-auth', action='store_true', - # dest='use_auth', help='force authentication ' - # 'even if not required') - #self.parser.add_option_group(global_options) self.shortcuts = [] def main(self): @@ -173,8 +168,7 @@ class DiffCommand(CommandBase): for file in status: if status[file] == 'U': print self.metadir.diff_rv_to_working( - mw.api.filename_to_pagename(file[:-5]) - ), + mw.api.filename_to_pagename(file[:-5])), class CommitCommand(CommandBase): @@ -221,6 +215,7 @@ class CommitCommand(CommandBase): # FIXME use basetimestamp and starttimestamp filename = os.path.join(self.metadir.root, file) text = codecs.open(filename, 'r', 'utf-8').read() + text = text.encode('utf-8') if text[-1] == '\n': text = text[:-1] md5 = hashlib.md5() @@ -232,6 +227,7 @@ class CommitCommand(CommandBase): 'token': edittoken, 'text': text, 'md5': textmd5, + 'summary': edit_summary, } response = self.api.call(data) if response['edit']['result'] == 'Success': @@ -243,7 +239,6 @@ class CommitCommand(CommandBase): 'ids|flags|timestamp|user|comment|content', } response = self.api.call(data)['query']['pages'] - print response self.metadir.pages_add_rv(int(pageid), response[pageid]['revisions'][0]) else: