[X2Go-Commits] python-x2go.git - twofactorauth (branch) updated: 0.4.0.8-15-gf23a13f

[X2Go dev team]

The branch, twofactorauth has been updated
       via  f23a13f492b4e25c6f235a426a859f234087deb6 (commit)
      from  bb8bbb234a7e393c1cd18c3e61cdaab041f93fb1 (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 f23a13f492b4e25c6f235a426a859f234087deb6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Sep 15 14:04:51 2013 +0200

    Compat fix in _paramiko monkey patch module to also work with early Paramiko versions.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog  |    2 ++
 x2go/_paramiko.py |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index d8d3582..ea4e5c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ python-x2go (0.4.0.9-0~x2go1) UNRELEASED; urgency=low
     - Fix parameter handling in X2GoSession.connect().
     - Rewrite passwords that are not string/unicode to an empty string.
     - Implement two-factor authentication.
+    - Compat fix in _paramiko monkey patch module to also work with early Paramiko
+      versions.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 07 Aug 2013 12:18:46 +0200
 
diff --git a/x2go/_paramiko.py b/x2go/_paramiko.py
index a7663f3..d40903b 100644
--- a/x2go/_paramiko.py
+++ b/x2go/_paramiko.py
@@ -24,7 +24,10 @@ Monkey Patch and feature map for Python Paramiko
 
 import paramiko
 import re
-from paramiko.config import SSH_PORT
+try:
+    from paramiko.config import SSH_PORT
+except ImportError:
+    SSH_PORT=22
 import platform
 from utils import compare_versions
 


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).