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/sbin | |
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/sbin')
-rwxr-xr-x | src/sbin/bcfg2-info | 4 | ||||
-rwxr-xr-x | src/sbin/bcfg2-reports | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info index 96da82bf7..c0c2673a5 100755 --- a/src/sbin/bcfg2-info +++ b/src/sbin/bcfg2-info @@ -190,7 +190,7 @@ Usage: [quit|exit]""" prof = 'yes' else: prof = 'no' - if self.metadata.categories.has_key(group): + if group in self.metadata.categories: cat = self.metadata.categories[group] else: cat = '' @@ -256,7 +256,7 @@ Usage: [quit|exit]""" else: interested = [(etype, generator.Entries[etype]) \ for etype in etypes \ - if generator.Entries.has_key(etype)] + if etype in generator.Entries] for etype, names in interested: for name in [name for name in names if name in \ generator.Entries.get(etype, {})]: diff --git a/src/sbin/bcfg2-reports b/src/sbin/bcfg2-reports index 16b9cd11e..abe24d037 100755 --- a/src/sbin/bcfg2-reports +++ b/src/sbin/bcfg2-reports @@ -232,7 +232,7 @@ else: for item in baditems: if item.name == badentry[1] and item.kind == badentry[0]: result.append(c_inst) - if entrydict.has_key(c_inst): + if c_inst in entrydict: entrydict.get(c_inst).append(badentry[1]) else: entrydict[c_inst] = [badentry[1]] @@ -254,7 +254,7 @@ else: for item in extraitems: if item.name == extraentry[1] and item.kind == extraentry[0]: result.append(c_inst) - if entrydict.has_key(c_inst): + if c_inst in entrydict: entrydict.get(c_inst).append(extraentry[1]) else: entrydict[c_inst] = [extraentry[1]] |