Python 3 bugfix: session decode password

katyukha · Sep 8, 2015 · bbafd4e · bbafd4e
1 parent 071f201
commit bbafd4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.coveragerc b/.coveragerc
@@ -2,3 +2,4 @@
 omit = 
     openerp_proxy/tests/*.*
     openerp_proxy/main.py
+    openerp_proxy/ext/log_execute_console.py
diff --git a/openerp_proxy/session.py b/openerp_proxy/session.py
@@ -234,13 +234,13 @@ def get_db(self, url_or_index, **kwargs):
             if self.option('store_passwords') and 'password' in ep_args:
                 import base64
                 crypter, password = base64.b64decode(ep_args.pop('password').encode('utf8')).split(b':')
-                if crypter == 'simplecrypt':  # pragma: no cover
+                if crypter == b'simplecrypt':  # pragma: no cover
                     import simplecrypt
                     ep_args['pwd'] = simplecrypt.decrypt(Client.to_url(ep_args), base64.b64decode(password))
-                elif crypter == 'plain':
+                elif crypter == b'plain':
                     ep_args['pwd'] = password.decode('utf-8')
-                else:
-                    raise Exception("Unknown crypter used in session")
+                else:  # pragma: no cover
+                    raise Exception("Unknown crypter (%s) used in session" % repr(crypter))
             else:
                 ep_args['pwd'] = getpass('Password: ')  # pragma: no cover