summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/Deps.py
diff options
context:
space:
mode:
authorSol Jerome <solj@ices.utexas.edu>2008-12-22 04:09:48 +0000
committerSol Jerome <solj@ices.utexas.edu>2008-12-22 04:09:48 +0000
commite3fb140c8d44d751766535eedefcc4ada6544bd1 (patch)
tree9cfe7aa923ec2b1f2e17df1ced892508987b9a6f /src/lib/Server/Plugins/Deps.py
parent5ab6c7a56e1cb16fee6b04a2b74e615f8f4c557e (diff)
downloadbcfg2-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/Deps.py')
-rw-r--r--src/lib/Server/Plugins/Deps.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Deps.py b/src/lib/Server/Plugins/Deps.py
index 21ff302fe..8749f2a31 100644
--- a/src/lib/Server/Plugins/Deps.py
+++ b/src/lib/Server/Plugins/Deps.py
@@ -61,7 +61,7 @@ class Deps(Bcfg2.Server.Plugin.PrioDir):
gdata = metadata.groups[:]
gdata.sort()
gdata = tuple(gdata)
- if self.cache.has_key((entries, gdata)):
+ if (entries, gdata) in self.cache:
prereqs = self.cache[(entries, gdata)]
else:
[src.Cache(metadata) for src in self.entries.values()]
@@ -70,8 +70,8 @@ class Deps(Bcfg2.Server.Plugin.PrioDir):
while toexamine:
entry = toexamine.pop()
matching = [src for src in self.entries.values()
- if src.cache and src.cache[1].has_key(entry[0])
- and src.cache[1][entry[0]].has_key(entry[1])]
+ if src.cache and entry[0] in src.cache[1]
+ and entry[1] in src.cache[1][entry[0]]]
if len(matching) > 1:
prio = [int(src.priority) for src in matching]
if prio.count(max(prio)) > 1: