From 2d77ed68e7f0f200618da34f1bd51b82b3ab8955 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 24 Apr 2012 14:51:03 -0500 Subject: PY3K: Get server code working again Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Plugins/SSHbase.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins/SSHbase.py') diff --git a/src/lib/Bcfg2/Server/Plugins/SSHbase.py b/src/lib/Bcfg2/Server/Plugins/SSHbase.py index ac281ad1a..a1a29727f 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -1,4 +1,4 @@ -'''This module manages ssh key files for bcfg2''' +"""This module manages ssh key files for bcfg2""" import binascii import re @@ -19,10 +19,15 @@ logger = logging.getLogger(__name__) class KeyData(Bcfg2.Server.Plugin.SpecificData): def __init__(self, name, specific, encoding): - Bcfg2.Server.Plugin.SpecificData.__init__(self, name, specific, + Bcfg2.Server.Plugin.SpecificData.__init__(self, + name, + specific, encoding) self.encoding = encoding + def __lt__(self, other): + return self.name < other.name + def bind_entry(self, entry, metadata): entry.set('type', 'file') if entry.get('encoding') == 'base64': @@ -212,7 +217,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, continue skn.append("%s %s" % (','.join(hostnames), - entry.data.decode().rstrip())) + entry.data.rstrip())) self.__skn = "\n".join(skn) + "\n" return self.__skn @@ -323,8 +328,8 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, pass hostkeys.sort() for hostkey in hostkeys: - entry.text += "localhost,localhost.localdomain,127.0.0.1 %s" % ( - hostkey.data.decode()) + entry.text += "localhost,localhost.localdomain,127.0.0.1 %s" % \ + (hostkey.data) self.entries[entry.get('name')].bind_info_to_entry(entry, metadata) def build_hk(self, entry, metadata): -- cgit v1.2.3-1-g7c22