The branch, twofactorauth has been updated via bb8bbb234a7e393c1cd18c3e61cdaab041f93fb1 (commit) from 57fa3a5160fc9698460122a4b7fc3dc00a94633d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bb8bbb234a7e393c1cd18c3e61cdaab041f93fb1 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sun Sep 15 00:50:52 2013 +0200 unknown parameters are thrown as TypeErrors (not AttributeErrors) ----------------------------------------------------------------------- Summary of changes: x2go/backends/control/_stdout.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) The diff of changes is: diff --git a/x2go/backends/control/_stdout.py b/x2go/backends/control/_stdout.py index 738275a..ac5f5d1 100644 --- a/x2go/backends/control/_stdout.py +++ b/x2go/backends/control/_stdout.py @@ -905,7 +905,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, passphrase=passphrase, pkey=pkey, key_filename=key_filename, timeout=timeout, allow_agent=False, look_for_keys=False) - except AttributeError: + except TypeError: self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=pkey, key_filename=key_filename, timeout=timeout, allow_agent=False, @@ -916,7 +916,7 @@ class X2GoControlSessionSTDOUT(paramiko.SSHClient): paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, passphrase=passphrase, pkey=None, key_filename=None, timeout=timeout, allow_agent=allow_agent, look_for_keys=look_for_keys) - except AttributeError: + except TypeError: if password and passphrase and password != passphrase: self.logger('your version of Paramiko/SSH does not support authentication workflows which require SSH key decryption in combination with two-factor authentication', loglevel=log.loglevel_WARN) paramiko.SSHClient.connect(self, _hostname, port=port, username=username, password=password, pkey=None, hooks/post-receive -- python-x2go.git (Python X2Go Client API) This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "python-x2go.git" (Python X2Go Client API).