From f2e78e1b3c857d5bc42835a0b08e054dc8942912 Mon Sep 17 00:00:00 2001 From: Daniel STAN Date: Tue, 30 Jul 2013 13:31:48 +0200 Subject: [PATCH] oubli init de old_clipboard MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ce qui faisait planter l'appel à la fonction de restoration. Celle-ci s'attend à recevoir old_clipboard=None si rien à restorer --- client.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client.py b/client.py index 3407187..ea1fd2a 100755 --- a/client.py +++ b/client.py @@ -527,7 +527,6 @@ def show_servers(options): for server in config.servers.keys(): print((u" * " + server).encode("utf-8")) -old_clipboard = None def saveclipboard(restore=False, old_clipboard=None): """Enregistre le contenu du presse-papier. Le rétablit si ``restore=True``""" if restore and old_clipboard == None: @@ -570,6 +569,7 @@ def show_file(options): ntexte = u"" hidden = False # Est-ce que le mot de passe a été caché ? lines = texte.split('\n') + old_clipboard = None for line in lines: catchPass = pass_regexp.match(line) if catchPass != None and options.clipboard: @@ -586,6 +586,7 @@ def show_file(options): out.write(raw.encode("utf-8")) out.close() os.waitpid(proc.pid, 0) + # Repope ancien pass if options.clipboard: saveclipboard(restore=True, old_clipboard=old_clipboard)