PEP8, pylint cleanups and removal of relative imports

apps/permissions/__init__.py

@@ -6,7 +6,7 @@ from django.utils.translation import ugettext_lazy as _
 from navigation.api import register_links, register_menu
 
 from permissions.conf.settings import DEFAULT_ROLES
-from models import Role
+from permissions.models import Role
 
 PERMISSION_ROLE_VIEW = 'role_view'
 PERMISSION_ROLE_EDIT = 'role_edit'

apps/permissions/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from models import Permission, PermissionHolder, Role, RoleMember
+from permissions.models import Permission, PermissionHolder, Role, RoleMember
+
 
 class PermissionHolderInline(admin.StackedInline):
     model = PermissionHolder
@@ -24,8 +25,7 @@ class RoleMemberInline(admin.StackedInline):
 
 class RoleAdmin(admin.ModelAdmin):
     inlines = [RoleMemberInline]
-    
+
 
 admin.site.register(Permission, PermissionAdmin)
 admin.site.register(Role, RoleAdmin)
-           

apps/permissions/api.py

@@ -11,7 +11,7 @@ from permissions import PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, \
     PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, \
     PERMISSION_PERMISSION_GRANT, PERMISSION_PERMISSION_REVOKE
 
-from models import Permission, Role
+from permissions.models import Permission, Role
 
 
 def register_permissions(namespace, permissions):
@@ -66,7 +66,7 @@ def check_requester(requester, permission_holder):
 
 #TODO: a role may contain groups, make recursive
 def check_elements(requester, requester_list):
-    ct = ContentType.objects.get_for_model(requester)
+    #ct = ContentType.objects.get_for_model(requester)
     for requester_object in requester_list:
         if requester == requester_object:
             return True

apps/permissions/forms.py

@@ -1,10 +1,9 @@
-from django.conf import settings
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
 from common.forms import DetailForm
 
-from models import Role, RoleMember
+from permissions.models import Role
 
 
 class RoleForm(forms.ModelForm):
@@ -24,6 +23,6 @@ class ChoiceForm(forms.Form):
         super(ChoiceForm, self).__init__(*args, **kwargs)
         self.fields['selection'].choices = choices
         self.fields['selection'].label = label
-        self.fields['selection'].widget.attrs.update({'size':14})
+        self.fields['selection'].widget.attrs.update({'size': 14})
 
     selection = forms.MultipleChoiceField()

apps/permissions/models.py

@@ -7,7 +7,7 @@ from django.contrib.contenttypes import generic
 class PermissionManager(models.Manager):
     def get_for_holder(self, holder):
         ct = ContentType.objects.get_for_model(holder)
-        return [Permission.objects.get(id=id) for id in PermissionHolder.objects.filter(holder_type=ct, holder_id=holder.id).values_list('permission_id', flat=True)]
+        return [Permission.objects.get(pk=pk) for pk in PermissionHolder.objects.filter(holder_type=ct, holder_id=holder.pk).values_list('permission_id', flat=True)]
 
 
 class Permission(models.Model):
@@ -56,7 +56,7 @@ class Role(models.Model):
         role_member, created = RoleMember.objects.get_or_create(
             role=self,
             member_type=ContentType.objects.get_for_model(member),
-            member_id=member.id)
+            member_id=member.pk)
 
     def __unicode__(self):
         return self.label

apps/permissions/views.py

@@ -10,12 +10,12 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ObjectDoesNotExist
 from django.contrib.auth.models import User
 
-from models import Role, Permission, PermissionHolder, RoleMember
-from forms import RoleForm, RoleForm_view, ChoiceForm
+from permissions.models import Role, Permission, PermissionHolder, RoleMember
+from permissions.forms import RoleForm, RoleForm_view, ChoiceForm
 from permissions import PERMISSION_ROLE_VIEW, PERMISSION_ROLE_EDIT, \
     PERMISSION_ROLE_CREATE, PERMISSION_ROLE_DELETE, PERMISSION_PERMISSION_GRANT, \
     PERMISSION_PERMISSION_REVOKE
-from api import check_permissions
+from permissions.api import check_permissions
 
 
 def role_list(request):