From be125cf84fb7e34b1e5bad10bb1355be89fcbe0e Mon Sep 17 00:00:00 2001 From: smurail Date: Tue, 5 May 2015 14:19:39 +0200 Subject: [PATCH] fix issue with GridVirtKeyboard usage while removing overkill optimization --- weboob/tools/captcha/virtkeyboard.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/weboob/tools/captcha/virtkeyboard.py b/weboob/tools/captcha/virtkeyboard.py index d4940766..c84fd2b7 100644 --- a/weboob/tools/captcha/virtkeyboard.py +++ b/weboob/tools/captcha/virtkeyboard.py @@ -145,7 +145,10 @@ class VirtKeyboard(object): for i in self.md5: if md5sum == self.md5[i]: return i - raise VirtKeyboardError('Symbol not found') + raise VirtKeyboardError('Symbol not found for hash "%s".' % md5sum) + + def get_string_code(self, string): + return ''.join((self.get_symbol_code(self.symbols[c]) for c in string)) def check_symbols(self, symbols, dirname): # symbols: dictionary : @@ -229,11 +232,3 @@ class GridVirtKeyboard(VirtKeyboard): super(GridVirtKeyboard, self).__init__() self.load_symbols(coords) - - def load_symbols(self, coords): - super(GridVirtKeyboard, self).load_symbols(coords) - symbol_codes = map(self.get_symbol_code, self.symbols.itervalues()) - self._trans = maketrans(''.join(self.symbols), ''.join(symbol_codes)) - - def get_string_code(self, string): - return str(string).translate(self._trans)