From 289b649107aff7c36648bbd50df7c2ca54681982 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Tue, 22 May 2012 14:59:46 -0500 Subject: Pkgmgr: Fix broken altsrc Use __contains__ instead of has_key in Pkgmgr. Gone in Py3k. Fallback on __getitem__ in PrioDir. Handles cased with an override for __getitem__ is used. --- src/lib/Bcfg2/Server/Plugins/Pkgmgr.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/lib/Bcfg2/Server/Plugins') diff --git a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py index e9254cdcc..8d6d85ef2 100644 --- a/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py +++ b/src/lib/Bcfg2/Server/Plugins/Pkgmgr.py @@ -24,12 +24,14 @@ class FuzzyDict(dict): print("got non-string key %s" % str(key)) return dict.__getitem__(self, key) - def has_key(self, key): + def __contains__(self, key): if isinstance(key, str): mdata = self.fuzzy.match(key) - if self.fuzzy.match(key): - return dict.has_key(self, mdata.groupdict()['name']) - return dict.has_key(self, key) + if mdata: + return dict.__contains__(self, mdata.groupdict()['name']) + else: + print("got non-string key %s" % str(key)) + return dict.__contains__(self, key) def get(self, key, default=None): try: -- cgit v1.2.3-1-g7c22