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.

2 files changed, 9 insertions, 4 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin.py b/src/lib/Bcfg2/Server/Plugin.py
index b668b7442..4e9199466 100644
--- a/src/lib/Bcfg2/Server/Plugin.py
+++ b/src/lib/Bcfg2/Server/Plugin.py
@@ -880,6 +880,9 @@ class PrioDir(Plugin, Generator, XMLDirectoryBacked):
             if self._matches(entry, metadata, [rname]):
                 data = matching[index].cache[1][entry.tag][rname]
                 break
+        else:
+            # Fall back on __getitem__. Required if override used
+            data = matching[index].cache[1][entry.tag][entry.get('name')]
         if '__text__' in data:
             entry.text = data['__text__']
         if '__children__' in data:
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: