[X2Go-Commits] [python-x2go] 01/01: x2go/checkhosts.py: Python3 fix in get_key_fingerprint().

git-admin at x2go.org git-admin at x2go.org
Mon May 14 15:06:58 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit 75fb1d969cc5a4374064466e941e49baaebaa2cc
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon May 14 15:06:44 2018 +0200

    x2go/checkhosts.py: Python3 fix in get_key_fingerprint().
---
 debian/changelog   | 1 +
 x2go/checkhosts.py | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 34fbc0e..2afde96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ python-x2go (0.5.99.1-0x2go1) UNRELEASED; urgency=medium
     - Build API doc with Sphinx.
     - Drop unit test framework. Never really used (though we should have).
       (Fixes: #1259).
+    - x2go/checkhosts.py: Python3 fix in get_key_fingerprint().
   * debian/: Adapt to building API docs with Sphinx.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 22 Sep 2017 14:15:05 +0200
diff --git a/x2go/checkhosts.py b/x2go/checkhosts.py
index 6fce772..50765b4 100644
--- a/x2go/checkhosts.py
+++ b/x2go/checkhosts.py
@@ -31,6 +31,7 @@ __name__    = 'x2go.checkhosts'
 # modules
 import paramiko
 import binascii
+import sys
 
 # Python X2Go modules
 from . import log
@@ -144,7 +145,10 @@ class X2GoMissingHostKeyPolicy(paramiko.MissingHostKeyPolicy):
         :rtype: ``str``
 
         """
-        return binascii.hexlify(self.key.get_fingerprint())
+        if sys.version_info[0] >= 3:
+            return binascii.hexlify(self.key.get_fingerprint()).decode()
+        else:
+            return binascii.hexlify(self.key.get_fingerprint())
 
     def get_key_fingerprint_with_colons(self):
         """\

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git


More information about the x2go-commits mailing list