* Merge Ben Finney's do not use has_key() (Closes: #481878)

A little bit adjusted to not remove the has_key() methods,
and to use has_key() where needed [the low-level part does
not have the needed functionality for 'key in mapping'].

1 files changed, 5 insertions, 5 deletions

diff --git a/apt/cache.py b/apt/cache.py
index 303bb99f..f134ab0a 100644
--- a/apt/cache.py
+++ b/apt/cache.py
@@ -105,10 +105,10 @@ class Cache(object):
         raise StopIteration
 
     def has_key(self, key):
-        return key in self._dict
+        return (key in self._dict)
 
     def __contains__(self, key):
-        return key in self._dict
+        return (key in self._dict)
 
     def __len__(self):
         return len(self._dict)
@@ -350,10 +350,10 @@ class FilteredCache(object):
         return self._filtered.keys()
 
     def has_key(self, key):
-        return key in self._filtered
+        return (key in self._filtered)
 
     def __contains__(self, key):
-        return key in self._filtered
+        return (key in self._filtered)
 
     def _reapplyFilter(self):
         " internal helper to refilter "
@@ -401,7 +401,7 @@ if __name__ == "__main__":
     c = Cache(apt.progress.OpTextProgress())
     c.connect("cache_pre_change", cache_pre_changed)
     c.connect("cache_post_change", cache_post_changed)
-    print "aptitude" in c
+    print ("aptitude" in c)
     p = c["aptitude"]
     print p.name
     print len(c)