replacing depricated has_key references by in to support python 3. Errors reported by python -3 roundup_server. Unit tests test_config test_security pass although test_config is a bit weak in coverage.

Author: rouilj

roundup/configuration.py

@@ -1008,7 +1008,7 @@ def add_section(self, section, options, description=None):
         *not* have aliases!
 
         """
-        if description or not self.section_descriptions.has_key(section):
+        if description or not (section in self.section_descriptions):
             self.section_descriptions[section] = description
         for option_def in options:
             klass = option_def[0]
@@ -1327,7 +1327,7 @@ def keys(self):
     # attribute emulation
 
     def __setattr__(self, name, value):
-        if self.__dict__.has_key(name) or hasattr(self.__class__, name):
+        if (name in self.__dict__) or hasattr(self.__class__, name):
             self.__dict__[name] = value
         else:
             self._get_option(name).set(value)

roundup/security.py

@@ -144,7 +144,7 @@ def getPermission(self, permission, classname=None, properties=None,
 
             Raise ValueError if there is no exact match.
         '''
-        if not self.permission.has_key(permission):
+        if permission not in self.permission:
             raise ValueError, 'No permission "%s" defined'%permission
 
         if classname:
@@ -187,7 +187,7 @@ def hasPermission(self, permission, userid, classname=None,
         if itemid and classname is None:
             raise ValueError, 'classname must accompany itemid'
         for rolename in self.db.user.get_roles(userid):
-            if not rolename or not self.role.has_key(rolename):
+            if not rolename or (rolename not in self.role):
                 continue
             # for each of the user's Roles, check the permissions
             for perm in self.role[rolename].permissions:
@@ -269,7 +269,7 @@ def hasSearchPermission(self, userid, classname, property):
            the list.
         '''
         roles = [r for r in self.db.user.get_roles(userid)
-                 if r and self.role.has_key(r)]
+                 if r and (r in self.role)]
         return self.roleHasSearchPermission (classname, property, *roles)
 
     def addPermission(self, **propspec):