From ba48c23030259f46174645d6af3ffda186fa279a 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/Server/Plugin.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/lib/Server/Plugin.py') diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index fa5e3ca9d..3e3616f46 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -881,6 +881,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: -- cgit v1.2.3-1-g7c22