changeset 2c866750d7c8 in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=2c866750d7c8 description: Fixed the duplication of input history

diffstat:

src/commands/framework.py | 12 ++++++------ src/commands/middleware.py | 6 ++---- 2 files changed, 8 insertions(+), 10 deletions(-)

diffs (53 lines):

diff -r 2b7b183c30a2 -r 2c866750d7c8 src/commands/framework.py --- a/src/commands/framework.py Sat Sep 26 13:16:48 2009 +0200 +++ b/src/commands/framework.py Sun Sep 27 12:32:57 2009 +0300 @@ -642,21 +642,21 @@ if not text.startswith(self.COMMAND_PREFIX): return False

- text = text[len(self.COMMAND_PREFIX):] - text = text.strip() + body = text[len(self.COMMAND_PREFIX):] + body = body.strip()

- parts = text.split(' ', 1) + parts = body.split(' ', 1) name, arguments = parts if len(parts) > 1 else (parts[0], None)

- flag = self.looks_like_command(text, name, arguments) + flag = self.looks_like_command(body, name, arguments) if flag is not None: return flag

- self.execute_command(name, arguments) + self.execute_command(text, name, arguments)

return True

- def execute_command(self, name, arguments): + def execute_command(self, text, name, arguments): command = self.retrieve_command(name)

args, opts = self.parse_command_arguments(arguments) if arguments else ([], []) diff -r 2b7b183c30a2 -r 2c866750d7c8 src/commands/middleware.py --- a/src/commands/middleware.py Sat Sep 26 13:16:48 2009 +0200 +++ b/src/commands/middleware.py Sun Sep 27 12:32:57 2009 +0300 @@ -31,16 +31,14 @@ Also provides some few basic utilities for the same purpose. """

- def process_as_command(self, text): + def execute_command(self, text, name, arguments): try: - return super(ChatMiddleware, self).process_as_command(text) + super(ChatMiddleware, self).execute_command(text, name, arguments) except CommandError, exception: self.echo("%s: %s" %(exception.name, exception.message), 'error') - return True except Exception: self.echo("An error occured while trying to execute the command", 'error') print_exc() - return True finally: self.add_history(text) self.clear_input()