From e3fb140c8d44d751766535eedefcc4ada6544bd1 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Mon, 22 Dec 2008 04:09:48 +0000 Subject: 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 --- src/lib/Server/Core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Core.py') diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index bd09dc53b..e25bec4b2 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -55,7 +55,7 @@ class Core(object): for plugin in structures + generators + plugins: - if not self.plugins.has_key(plugin): + if not plugin in self.plugins: self.init_plugins(plugin) chk_plugins = self.plugins.values() @@ -162,7 +162,7 @@ class Core(object): entry.get('name'))) glist = [gen for gen in self.generators if - gen.Entries.get(entry.tag, {}).has_key(entry.get('name'))] + entry.get('name') in gen.Entries.get(entry.tag, {})] if len(glist) == 1: return glist[0].Entries[entry.tag][entry.get('name')](entry, metadata) elif len(glist) > 1: @@ -190,7 +190,7 @@ class Core(object): logger.error("error in GetStructures", exc_info=1) return lxml.etree.Element("error", type='structure error') - if self.plugins.has_key('Deps'): + if 'Deps' in self.plugins: # do prereq processing prereqs = self.plugins['Deps'].GeneratePrereqs(structures, meta) structures.append(prereqs) -- cgit v1.2.3-1-g7c22