diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2008-12-22 04:09:48 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2008-12-22 04:09:48 +0000 |
| commit | e3fb140c8d44d751766535eedefcc4ada6544bd1 (patch) | |
| tree | 9cfe7aa923ec2b1f2e17df1ced892508987b9a6f /src/lib/Server/Plugins/SSHbase.py | |
| parent | 5ab6c7a56e1cb16fee6b04a2b74e615f8f4c557e (diff) | |
| download | bcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.tar.gz bcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.tar.bz2 bcfg2-e3fb140c8d44d751766535eedefcc4ada6544bd1.zip | |
Update dictionary accesses to work with Python 3.0
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4999 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugins/SSHbase.py')
| -rw-r--r-- | src/lib/Server/Plugins/SSHbase.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/SSHbase.py b/src/lib/Server/Plugins/SSHbase.py index e1d80b0bc..4910cb6f4 100644 --- a/src/lib/Server/Plugins/SSHbase.py +++ b/src/lib/Server/Plugins/SSHbase.py @@ -108,7 +108,7 @@ class SSHbase(Bcfg2.Server.Plugin.GeneratorPlugin, Bcfg2.Server.Plugin.Director def get_ipcache_entry(self, client): '''build a cache of dns results''' - if self.ipcache.has_key(client): + if client in self.ipcache: if self.ipcache[client]: return self.ipcache[client] else: @@ -133,7 +133,7 @@ class SSHbase(Bcfg2.Server.Plugin.GeneratorPlugin, Bcfg2.Server.Plugin.Director client = metadata.hostname entry.text = self.skn hostkeys = [keytmpl % client for keytmpl in self.pubkeys \ - if self.entries.has_key(keytmpl % client)] + if (keytmpl % client) in self.entries] hostkeys.sort() for hostkey in hostkeys: entry.text += "localhost,localhost.localdomain,127.0.0.1 %s" % ( @@ -147,7 +147,7 @@ class SSHbase(Bcfg2.Server.Plugin.GeneratorPlugin, Bcfg2.Server.Plugin.Director filename = "%s.H_%s" % (entry.get('name').split('/')[-1], client) if filename not in self.entries.keys(): self.GenerateHostKeys(client) - if not self.entries.has_key(filename): + if not filename in self.entries: self.logger.error("%s still not registered" % filename) raise Bcfg2.Server.Plugin.PluginExecutionError keydata = self.entries[filename].data |