Cleaned up files, removed ununsed imports

apps/permissions/models.py

@@ -26,10 +26,10 @@ class Permission(models.Model):
 
     def __unicode__(self):
         return self.label
-        
+
     def get_holders(self):
         return [holder.holder_object for holder in self.permissionholder_set.all()]
-        
+
     def has_permission(self, requester):
         if isinstance(requester, User):
             if requester.is_superuser or requester.is_staff:
@@ -38,8 +38,8 @@ class Permission(models.Model):
         # Request is one of the permission's holders?
         if requester in self.get_holders():
             return True
-        
-        # If not check if the requesters memberships objects is one of 
+
+        # If not check if the requesters memberships objects is one of
         # the permission's holder?
         roles = RoleMember.objects.get_roles_for_member(requester)
 
@@ -47,7 +47,7 @@ class Permission(models.Model):
             groups = requester.groups.all()
         else:
             groups = []
-            
+
         for membership in list(set(roles) | set(groups)):
             if self.has_permission(membership):
                 return True

apps/permissions/views.py

@@ -191,19 +191,19 @@ def add_role_member(role, selection):
     new_member, created = RoleMember.objects.get_or_create(role=role, member_type=ct, member_id=pk)
     if not created:
         raise Exception
-    
-    
+
+
 def remove_role_member(role, selection):
     model, pk = selection.split(u',')
     ct = ContentType.objects.get(model=model)
     member = RoleMember.objects.get(role=role, member_type=ct, member_id=pk)
     member.delete()    
-    
+
 
 def role_members(request, role_id):
     check_permissions(request.user, 'permissions', [PERMISSION_ROLE_EDIT])
     role = get_object_or_404(Role, pk=role_id)
-    
+
     return assign_remove(
         request,
         left_list=lambda: generate_choices_w_labels(get_non_role_members(role)),