Import cleanups, reorganization, PEP8 cleanups

mayan/apps/linking/__init__.py

@@ -6,19 +6,20 @@ from documents.models import Document
 from navigation.api import register_links, register_sidebar_template
 from project_setup.api import register_setup
 
-from .links import (smart_link_instances_for_document,
-    smart_link_setup, smart_link_list, smart_link_create, smart_link_edit,
-    smart_link_delete, smart_link_condition_list, smart_link_condition_create,
-    smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list)
+from .links import (smart_link_acl_list, smart_link_create,
+                    smart_link_condition_create, smart_link_condition_delete,
+                    smart_link_condition_edit, smart_link_condition_list,
+                    smart_link_delete, smart_link_edit,
+                    smart_link_instances_for_document, smart_link_list,
+                    smart_link_setup)
 from .models import SmartLink, SmartLinkCondition
-from .permissions import (PERMISSION_SMART_LINK_VIEW,
-    PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
+from .permissions import (PERMISSION_SMART_LINK_DELETE,
+                          PERMISSION_SMART_LINK_EDIT,
+                          PERMISSION_SMART_LINK_VIEW)
 
 register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
-
 register_links(SmartLink, [smart_link_edit, smart_link_delete, smart_link_condition_list, smart_link_acl_list])
 register_links([SmartLink, 'linking:smart_link_list', 'linking:smart_link_create'], [smart_link_list, smart_link_create], menu_name='secondary_menu')
-
 register_links(SmartLinkCondition, [smart_link_condition_edit, smart_link_condition_delete])
 register_links(['linking:smart_link_condition_list', 'linking:smart_link_condition_create', 'linking:smart_link_condition_edit', 'linking:smart_link_condition_delete'], [smart_link_condition_create], menu_name='sidebar')
 
@@ -26,9 +27,6 @@ register_setup(smart_link_setup)
 register_sidebar_template(['linking:smart_link_list'], 'smart_links_help.html')
 
 class_permissions(SmartLink, [
-    PERMISSION_SMART_LINK_VIEW,
-    PERMISSION_SMART_LINK_DELETE,
-    PERMISSION_SMART_LINK_EDIT,
-    ACLS_EDIT_ACL,
-    ACLS_VIEW_ACL
+    ACLS_EDIT_ACL, ACLS_VIEW_ACL, PERMISSION_SMART_LINK_DELETE,
+    PERMISSION_SMART_LINK_EDIT, PERMISSION_SMART_LINK_VIEW
 ])

mayan/apps/linking/links.py

@@ -6,7 +6,8 @@ from acls.permissions import ACLS_VIEW_ACL
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 
 from .permissions import (PERMISSION_SMART_LINK_CREATE,
-    PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
+                          PERMISSION_SMART_LINK_DELETE,
+                          PERMISSION_SMART_LINK_EDIT)
 
 smart_link_instance_view_link = {'text': _(u'Smart links actions'), 'view': 'linking:smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 smart_link_instances_for_document = {'text': _(u'Smart links'), 'view': 'linking:smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}

mayan/apps/linking/managers.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import
 from django.db import models
 from django.db.models import Q
 
-from metadata.classes import MetadataClass
 from documents.models import Document
+from metadata.classes import MetadataClass
 
 from .literals import INCLUSION_AND, INCLUSION_OR
 

mayan/apps/linking/models.py

@@ -3,9 +3,8 @@ from __future__ import absolute_import
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
+from .literals import INCLUSION_AND, INCLUSION_CHOICES, OPERATOR_CHOICES
 from .managers import SmartLinkManager
-from .literals import (OPERATOR_CHOICES, INCLUSION_AND,
-    INCLUSION_CHOICES)
 
 
 class SmartLink(models.Model):

mayan/apps/linking/views.py

@@ -10,23 +10,24 @@ from django.shortcuts import get_object_or_404, render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
-from acls.views import acl_list_for
 from acls.models import AccessEntry
 from acls.utils import apply_default_acls
+from acls.views import acl_list_for
 from common.utils import encapsulate
 from common.widgets import two_state_template
 from documents.models import Document
-from documents.views import document_list
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
+from documents.views import document_list
 from permissions.models import Permission
 
-from .forms import (SmartLinkInstanceForm, SmartLinkForm,
-    SmartLinkConditionForm)
+from .forms import (SmartLinkConditionForm, SmartLinkInstanceForm,
+                    SmartLinkForm)
 from .links import smart_link_instance_view_link
 from .models import SmartLink, SmartLinkCondition
-from .permissions import (PERMISSION_SMART_LINK_VIEW,
-    PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
-    PERMISSION_SMART_LINK_EDIT)
+from .permissions import (PERMISSION_SMART_LINK_CREATE,
+                          PERMISSION_SMART_LINK_DELETE,
+                          PERMISSION_SMART_LINK_EDIT,
+                          PERMISSION_SMART_LINK_VIEW)
 from .settings import SHOW_EMPTY_SMART_LINKS
 
 logger = logging.getLogger(__name__)