diff -r 0bb18407c053 -r 574bb05e40a4 entity.py
--- a/entity.py	Thu Feb 14 16:01:24 2013 +0100
+++ b/entity.py	Thu Feb 14 16:45:07 2013 +0100
@@ -898,7 +898,7 @@
         selected = []
         for attr in (attributes or self._cw_to_complete_attributes(skip_bytes, skip_pwd)):
             # if attribute already in entity, nothing to do
-            if self.cw_attr_cache.has_key(attr):
+            if attr in self.cw_attr_cache:
                 continue
             # case where attribute must be completed, but is not yet in entity
             var = varmaker.next()