From 2724e6409534a948b5a2c212ae0a7192326c1b4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonah=20Br=C3=BCchert?= Date: Fri, 19 Apr 2024 23:52:23 +0200 Subject: Run 2to3 on the entire project --- src/lib/Bcfg2/Server/Plugins/SSHbase.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 08acc4d8d..ecdb6d9ed 100644 --- a/src/lib/Bcfg2/Server/Plugins/SSHbase.py +++ b/src/lib/Bcfg2/Server/Plugins/SSHbase.py @@ -226,7 +226,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, if pubk.endswith('.pub')] pubkeys.sort() for pubkey in pubkeys: - for entry in sorted(self.entries[pubkey].entries.values(), + for entry in sorted(list(self.entries[pubkey].entries.values()), key=lambda e: (e.specific.hostname or e.specific.group)): specific = entry.specific @@ -421,9 +421,9 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, self.entries[entry.get('name')].bind_entry(entry, metadata) is_bound = True except Bcfg2.Server.Plugin.PluginExecutionError: - print("Failed to bind %s: %s") % ( + print(("Failed to bind %s: %s") % ( lxml.etree.tostring(entry), - sys.exc_info()[1]) + sys.exc_info()[1])) def GenerateHostKeyPair(self, client, filename): """Generate new host key pair for client.""" @@ -497,7 +497,7 @@ class SSHbase(Bcfg2.Server.Plugin.Plugin, try: open(filename, 'w').write(entry['text']) if log: - print("Wrote file %s" % filename) + print(("Wrote file %s" % filename)) except KeyError: self.logger.error("Failed to pull %s. This file does not " "currently exist on the client" % -- cgit v1.2.3-1-g7c22