Misc cleanups, PEP8, conding conventions, spaces, unused imports, False/True comparisons

apps/app_registry/models.py

@@ -1,17 +1,14 @@
 from __future__ import absolute_import
 
 import logging
-import imp
-import sys
 
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 from django.utils.importlib import import_module
 
+from bootstrap.classes import BootstrapModel, Cleanup
+from navigation.api import register_top_menu
 from project_setup.api import register_setup
 from project_tools.api import register_tool
-from navigation.api import register_top_menu
-from bootstrap.classes import Cleanup, BootstrapModel
 
 logger = logging.getLogger(__name__)
 

apps/checkouts/__init__.py

@@ -2,23 +2,21 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
+from acls.api import class_permissions
+from documents.models import Document
+from history.api import register_history_type
 from navigation.api import (register_links, register_top_menu,
     register_multi_item_links, register_sidebar_template)
 from scheduler.api import register_interval_job
 
-from documents.models import Document
+from .events import (HISTORY_DOCUMENT_CHECKED_OUT, HISTORY_DOCUMENT_CHECKED_IN,
-from documents.permissions import PERMISSION_DOCUMENT_VIEW
+    HISTORY_DOCUMENT_AUTO_CHECKED_IN, HISTORY_DOCUMENT_FORCEFUL_CHECK_IN)
-from acls.api import class_permissions
+from .links import checkout_list, checkout_document, checkout_info, checkin_document
-from history.api import register_history_type
+from .models import DocumentCheckout
-
 from .permissions import (PERMISSION_DOCUMENT_CHECKOUT,
     PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE,
     PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE)
-from .links import checkout_list, checkout_document, checkout_info, checkin_document
-from .models import DocumentCheckout
 from .tasks import task_check_expired_check_outs
-from .events import (HISTORY_DOCUMENT_CHECKED_OUT, HISTORY_DOCUMENT_CHECKED_IN,
-    HISTORY_DOCUMENT_AUTO_CHECKED_IN, HISTORY_DOCUMENT_FORCEFUL_CHECK_IN)
 
 
 def initialize_document_checkout_extra_methods():

apps/checkouts/exceptions.py

@@ -4,6 +4,7 @@ class DocumentNotCheckedOut(Exception):
     """
     pass
 
+
 class DocumentAlreadyCheckedOut(Exception):
     """
     Raised when trying to checkout an already checkedout document

apps/checkouts/forms.py

@@ -1,10 +1,9 @@
 from __future__ import absolute_import
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 
-from .models import DocumentCheckout
 from .exceptions import DocumentAlreadyCheckedOut
+from .models import DocumentCheckout
 from .widgets import SplitTimeDeltaField
 
 

apps/checkouts/links.py

@@ -2,8 +2,6 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from documents.permissions import PERMISSION_DOCUMENT_VIEW
-
 from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN, PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
 
 

apps/checkouts/managers.py

@@ -6,18 +6,17 @@ import logging
 from django.db import models
 from django.core.exceptions import PermissionDenied
 
+from acls.models import AccessEntry
 from documents.models import Document
 from history.api import create_history
 from permissions.models import Permission
-from acls.models import AccessEntry
 
-from .exceptions import DocumentNotCheckedOut
-from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
 from .events import (HISTORY_DOCUMENT_CHECKED_IN, HISTORY_DOCUMENT_AUTO_CHECKED_IN,
     HISTORY_DOCUMENT_FORCEFUL_CHECK_IN)
+from .exceptions import DocumentNotCheckedOut
+from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN
 from .permissions import PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE
 
-from history.api import create_history
 logger = logging.getLogger(__name__)
 
 
@@ -98,4 +97,3 @@ class DocumentCheckoutManager(models.Manager):
                             return True
                     else:
                         return True
-            

apps/checkouts/models.py

@@ -1,19 +1,18 @@
 from __future__ import absolute_import
 
-import logging
 import datetime
+import logging
 
-from django.db import models, IntegrityError
-from django.utils.translation import ugettext_lazy as _
-from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.models import ContentType
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
 
 from documents.models import Document
 from history.api import create_history
 
-from .managers import DocumentCheckoutManager
-from .exceptions import DocumentAlreadyCheckedOut
 from .events import HISTORY_DOCUMENT_CHECKED_OUT
+from .managers import DocumentCheckoutManager
 
 logger = logging.getLogger(__name__)
 

apps/checkouts/permissions.py

@@ -10,4 +10,3 @@ PERMISSION_DOCUMENT_CHECKOUT = Permission.objects.register(namespace, 'checkout_
 PERMISSION_DOCUMENT_CHECKIN = Permission.objects.register(namespace, 'checkin_document', _(u'Check in documents'))
 PERMISSION_DOCUMENT_CHECKIN_OVERRIDE = Permission.objects.register(namespace, 'checkin_document_override', _(u'Forcefully check in documents'))
 PERMISSION_DOCUMENT_RESTRICTIONS_OVERRIDE = Permission.objects.register(namespace, 'checkout_restrictions_override', _(u'Allow overriding check out restrictions'))
-

apps/checkouts/views.py

@@ -1,27 +1,26 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
+from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.contrib import messages
+from django.utils.translation import ugettext_lazy as _
-from django.core.urlresolvers import reverse
-from django.core.exceptions import PermissionDenied
 
-from documents.views import document_list
 from documents.models import Document
+from documents.views import document_list
 
-from permissions.models import Permission
 from acls.models import AccessEntry
 from common.utils import get_object_name
 from common.utils import encapsulate
+from permissions.models import Permission
 
+from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
+from .forms import DocumentCheckoutForm
 from .models import DocumentCheckout
 from .permissions import (PERMISSION_DOCUMENT_CHECKOUT, PERMISSION_DOCUMENT_CHECKIN,
     PERMISSION_DOCUMENT_CHECKIN_OVERRIDE)
-from .forms import DocumentCheckoutForm
-from .exceptions import DocumentAlreadyCheckedOut, DocumentNotCheckedOut
-from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN, STATE_ICONS, STATE_LABELS
 from .widgets import checkout_widget
 
 

apps/checkouts/widgets.py

@@ -3,12 +3,12 @@ from __future__ import absolute_import
 import datetime
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
-from django.utils.safestring import mark_safe
 from django.conf import settings
 from django.core import validators
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext_lazy as _
 
-from .literals import STATE_CHECKED_OUT, STATE_CHECKED_IN, STATE_ICONS, STATE_LABELS
+from .literals import STATE_ICONS, STATE_LABELS
 
 
 def checkout_widget(document):

apps/django_gpg/__init__.py

@@ -1,10 +1,11 @@
 from __future__ import absolute_import
 
+from hkp import Key as KeyServerKey
+
 from django.utils.translation import ugettext_lazy as _
 
 from navigation.api import register_links
 from project_setup.api import register_setup
-from hkp import Key as KeyServerKey
 
 from .api import Key
 from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,

apps/django_gpg/api.py

@@ -1,19 +1,19 @@
 from __future__ import absolute_import
 
 import logging
-import tempfile
 import os
+import tempfile
 
 try:
     from cStringIO import StringIO
 except ImportError:
     from StringIO import StringIO
 
-from django.utils.translation import ugettext_lazy as _
-
 from hkp import KeyServer
 import gnupg
 
+from django.utils.translation import ugettext_lazy as _
+
 from .exceptions import (GPGVerificationError, GPGSigningError,
     GPGDecryptionError, KeyDeleteError, KeyGenerationError,
     KeyFetchingError, KeyDoesNotExist, KeyImportError)
@@ -110,7 +110,7 @@ class Key(object):
         keys = gpg.gpg.list_keys(secret=secret)
         key = next((key for key in keys if key['keyid'] == key_id), None)
         if not key:
-            if search_keyservers and secret == False:
+            if search_keyservers and secret is False:
                 try:
                     gpg.receive_key(key_id)
                     return Key(gpg, key_id)

apps/django_gpg/views.py

@@ -2,21 +2,21 @@ from __future__ import absolute_import
 
 import logging
 
-from django.utils.translation import ugettext_lazy as _
+from django.contrib import messages
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from django.contrib import messages
+from django.utils.translation import ugettext_lazy as _
 
-from permissions.models import Permission
 from common.utils import encapsulate
+from permissions.models import Permission
 
 from .api import Key
-from .runtime import gpg
+from .exceptions import KeyImportError
-from .exceptions import KeyFetchingError, KeyImportError
 from .forms import KeySearchForm
 from .permissions import (PERMISSION_KEY_VIEW, PERMISSION_KEY_DELETE,
     PERMISSION_KEYSERVER_QUERY, PERMISSION_KEY_RECEIVE)
+from .runtime import gpg
 
 logger = logging.getLogger(__name__)
 

apps/document_indexing/links.py

@@ -9,8 +9,7 @@ from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
     PERMISSION_DOCUMENT_INDEXING_SETUP,
     PERMISSION_DOCUMENT_INDEXING_CREATE,
     PERMISSION_DOCUMENT_INDEXING_EDIT,
-    PERMISSION_DOCUMENT_INDEXING_DELETE
+    PERMISSION_DOCUMENT_INDEXING_DELETE)
-)
 
 
 def is_not_root_node(context):

apps/document_indexing/models.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-from mptt.models import MPTTModel
 from mptt.fields import TreeForeignKey
+from mptt.models import MPTTModel
 
 from documents.models import Document, DocumentType
 

apps/document_indexing/views.py

@@ -1,24 +1,24 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
+from django.contrib import messages
+from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.contrib import messages
-from django.core.urlresolvers import reverse
-from django.core.exceptions import PermissionDenied
 from django.utils.html import mark_safe
-from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
 
-from permissions.models import Permission
+from acls.models import AccessEntry
+from acls.utils import apply_default_acls
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
 from documents.views import document_list
 from common.utils import encapsulate, generate_choices_w_labels
 from common.views import assign_remove
 from common.widgets import two_state_template
-from acls.utils import apply_default_acls
+from permissions.models import Permission
-from acls.models import AccessEntry
 
 from .forms import IndexForm, IndexTemplateNodeForm
 from .models import (Index, IndexTemplateNode, IndexInstanceNode)

apps/document_signatures/__init__.py

@@ -7,7 +7,6 @@ try:
 except ImportError:
     from StringIO import StringIO
 
-from django.utils.translation import ugettext_lazy as _
 # from django.db.models.signals import post_save
 # from django.dispatch import receiver
 

apps/document_signatures/forms.py

@@ -1,9 +1,5 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
-#from django.utils.translation import ugettext
-#from django.core.urlresolvers import reverse
-#from django.utils.safestring import mark_safe
-#from django.conf import settings
 
 
 class DetachedSignatureForm(forms.Form):

apps/document_signatures/links.py

@@ -16,7 +16,7 @@ def has_embedded_signature(context):
 
 
 def doesnt_have_detached_signature(context):
-    return DocumentVersionSignature.objects.has_detached_signature(context['object']) == False
+    return DocumentVersionSignature.objects.has_detached_signature(context['object']) is False
 
 
 document_signature_delete = {'text': _(u'delete signature'), 'view': 'document_signature_delete', 'args': 'object.pk', 'famfam': 'pencil_delete', 'permissions': [PERMISSION_SIGNATURE_DELETE], 'conditional_disable': doesnt_have_detached_signature}

apps/documents/forms.py

@@ -8,9 +8,7 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 
-from common.conf.settings import DEFAULT_PAPER_SIZE, DEFAULT_PAGE_ORIENTATION
 from common.forms import DetailForm
-from common.literals import PAGE_SIZE_CHOICES, PAGE_ORIENTATION_CHOICES
 from common.widgets import TextAreaDiv
 
 from .models import (Document, DocumentType,

apps/documents/views.py

@@ -35,8 +35,7 @@ from permissions.models import Permission
 
 from .events import HISTORY_DOCUMENT_EDITED
 from .conf.settings import (PREVIEW_SIZE, STORAGE_BACKEND, ZOOM_PERCENT_STEP,
-    ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL, ROTATION_STEP, PRINT_SIZE,
+    ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL, ROTATION_STEP, RECENT_COUNT)
-    RECENT_COUNT)
 from .forms import (DocumentForm_edit, DocumentPropertiesForm,
         DocumentPreviewForm, DocumentPageForm,
         DocumentPageTransformationForm, DocumentContentForm,

apps/linking/__init__.py

@@ -1,11 +1,8 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
-
 from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
 from acls.api import class_permissions
 from documents.models import Document
-from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from navigation.api import register_links, register_sidebar_template
 from project_setup.api import register_setup
 
@@ -15,8 +12,7 @@ from .links import (smart_link_instance_view_link, smart_link_instances_for_docu
     smart_link_condition_edit, smart_link_condition_delete, smart_link_acl_list)
 from .models import SmartLink, SmartLinkCondition
 from .permissions import (PERMISSION_SMART_LINK_VIEW,
-    PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
+    PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
-    PERMISSION_SMART_LINK_EDIT)
 
 register_links(Document, [smart_link_instances_for_document], menu_name='form_header')
 

apps/linking/links.py

@@ -2,12 +2,11 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from acls import ACLS_EDIT_ACL, ACLS_VIEW_ACL
+from acls import ACLS_VIEW_ACL
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 
-from .permissions import (PERMISSION_SMART_LINK_VIEW,
+from .permissions import (PERMISSION_SMART_LINK_CREATE,
-    PERMISSION_SMART_LINK_CREATE, PERMISSION_SMART_LINK_DELETE,
+    PERMISSION_SMART_LINK_DELETE, PERMISSION_SMART_LINK_EDIT)
-    PERMISSION_SMART_LINK_EDIT)
 
 smart_link_instance_view_link = {'text': _(u'smart links actions'), 'view': 'smart_link_instance_view', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}
 smart_link_instances_for_document = {'text': _(u'smart links'), 'view': 'smart_link_instances_for_document', 'args': 'object.pk', 'famfam': 'page_link', 'permissions': [PERMISSION_DOCUMENT_VIEW]}

apps/linking/views.py

@@ -2,29 +2,29 @@ from __future__ import absolute_import
 
 import logging
 
-from django.utils.translation import ugettext_lazy as _
 from django.contrib import messages
+from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render_to_response
-from django.core.urlresolvers import reverse
 from django.template import RequestContext
-from django.core.exceptions import PermissionDenied
+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 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 permissions.models import Permission
-from acls.views import acl_list_for
-from acls.models import AccessEntry
-from acls.utils import apply_default_acls
 
-from .models import SmartLink, SmartLinkCondition
+from . import smart_link_instance_view_link
 from .conf.settings import SHOW_EMPTY_SMART_LINKS
 from .forms import (SmartLinkInstanceForm, SmartLinkForm,
     SmartLinkConditionForm)
-from . 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)

apps/metadata/__init__.py

@@ -5,7 +5,6 @@ from django.utils.translation import ugettext_lazy as _
 from acls.api import class_permissions
 from common.utils import encapsulate
 from documents.models import Document, DocumentType
-from documents.permissions import PERMISSION_DOCUMENT_TYPE_EDIT
 from navigation.api import (register_links, register_multi_item_links,
     register_sidebar_template, register_model_list_columns)
 from project_setup.api import register_setup
@@ -20,11 +19,7 @@ from .links import (metadata_edit, metadata_view, metadata_multiple_edit,
 from .models import MetadataType, MetadataSet
 from .permissions import (PERMISSION_METADATA_DOCUMENT_EDIT,
     PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_REMOVE,
-    PERMISSION_METADATA_DOCUMENT_VIEW, PERMISSION_METADATA_TYPE_EDIT,
+    PERMISSION_METADATA_DOCUMENT_VIEW)
-    PERMISSION_METADATA_TYPE_CREATE, PERMISSION_METADATA_TYPE_DELETE,
-    PERMISSION_METADATA_TYPE_VIEW, PERMISSION_METADATA_SET_EDIT,
-    PERMISSION_METADATA_SET_CREATE, PERMISSION_METADATA_SET_DELETE,
-    PERMISSION_METADATA_SET_VIEW)
 
 register_links(['metadata_add', 'metadata_edit', 'metadata_remove', 'metadata_view'], [metadata_add, metadata_edit, metadata_remove], menu_name='sidebar')
 register_links(Document, [metadata_view], menu_name='form_header')

apps/metadata/views.py

@@ -510,7 +510,6 @@ def setup_metadata_set_delete(request, metadata_set_id):
                 'metadata_set': metadata_set, 'error': e})
             return HttpResponseRedirect(previous)
 
-
     context = {
         'object_name': _(u'metadata set'),
         'delete_view': True,

apps/registration/__init__.py

@@ -1,15 +1,16 @@
 from __future__ import absolute_import
 
-from django.utils.translation import ugettext_lazy as _
 from django.db import transaction, DatabaseError
-from navigation.api import register_links
+from django.utils.translation import ugettext_lazy as _
+
 from common import about_view, license_view
+from navigation.api import register_links
 
 from .models import RegistrationSingleton
 
 
 def is_not_registered(context):
-    return RegistrationSingleton.registration_state() == False
+    return RegistrationSingleton.registration_state() is False
 
 
 form_view = {'text': _('Registration'), 'view': 'form_view', 'famfam': 'telephone', 'condition': is_not_registered}

apps/registration/templatetags/registration_tags.py

@@ -1,8 +1,6 @@
 from __future__ import absolute_import
 
-from django.core.urlresolvers import reverse, NoReverseMatch
+from django.template import Library
-from django.template import (TemplateSyntaxError, Library,
-    VariableDoesNotExist, Node, Variable)
 from django.utils.translation import ugettext as _
 
 from ..models import RegistrationSingleton

apps/scheduler/__init__.py

@@ -4,12 +4,11 @@ import atexit
 import logging
 import sys
 
-from .runtime import scheduler, lockdown
-
 from project_tools.api import register_tool
 
 from .links import job_list
 from .literals import SHUTDOWN_COMMANDS
+from .runtime import scheduler, lockdown
 
 logger = logging.getLogger(__name__)
 

apps/scheduler/api.py

@@ -1,7 +1,7 @@
 from __future__ import absolute_import
 
-from .runtime import scheduler
 from .exceptions import AlreadyScheduled
+from .runtime import scheduler
 
 registered_jobs = {}
 

apps/scheduler/views.py

@@ -3,13 +3,12 @@ from __future__ import absolute_import
 from django.shortcuts import render_to_response
 from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import PermissionDenied
 
-from permissions.models import Permission
 from common.utils import encapsulate
+from permissions.models import Permission
 
-from .permissions import PERMISSION_VIEW_JOB_LIST
 from .api import get_job_list
+from .permissions import PERMISSION_VIEW_JOB_LIST
 
 
 def job_list(request):

apps/tags/__init__.py

@@ -2,22 +2,22 @@ from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
 
-from navigation.api import (register_links, register_top_menu,
+from acls.api import class_permissions
-    register_model_list_columns, register_multi_item_links)
 from common.utils import encapsulate
 from documents.models import Document
-from acls.api import class_permissions
+from navigation.api import (register_links, register_top_menu,
+    register_model_list_columns, register_multi_item_links)
 
-from taggit.models import Tag
 from taggit.managers import TaggableManager
+from taggit.models import Tag
 
 from .links import (tag_list, tag_create, tag_attach,
     tag_document_list, tag_delete, tag_edit, tag_tagged_item_list,
     tag_multiple_delete, tag_acl_list, tag_multiple_attach,
     single_document_multiple_tag_remove, multiple_documents_selection_tag_remove)
-from .widgets import (get_tags_inline_widget_simple, single_tag_widget)
 from .permissions import (PERMISSION_TAG_ATTACH, PERMISSION_TAG_REMOVE,
     PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT, PERMISSION_TAG_VIEW)
+from .widgets import (get_tags_inline_widget_simple, single_tag_widget)
 
 register_model_list_columns(Tag, [
     {

apps/tags/forms.py

@@ -3,8 +3,8 @@ from __future__ import absolute_import
 import logging
 
 from django import forms
-from django.utils.translation import ugettext_lazy as _
 from django.core.exceptions import PermissionDenied
+from django.utils.translation import ugettext_lazy as _
 
 from taggit.models import Tag
 

apps/tags/links.py

@@ -5,8 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from acls.permissions import ACLS_VIEW_ACL
 
 from .permissions import (PERMISSION_TAG_CREATE, PERMISSION_TAG_ATTACH,
-    PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT,
+    PERMISSION_TAG_REMOVE, PERMISSION_TAG_DELETE, PERMISSION_TAG_EDIT)
-    PERMISSION_TAG_VIEW)
 
 tag_list = {'text': _(u'tag list'), 'view': 'tag_list', 'famfam': 'tag_blue'}
 tag_create = {'text': _(u'create new tag'), 'view': 'tag_create', 'famfam': 'tag_blue_add', 'permissions': [PERMISSION_TAG_CREATE]}

apps/tags/views.py

@@ -2,22 +2,22 @@ from __future__ import absolute_import
 
 import logging
 
+from django.contrib import messages
+from django.core.exceptions import PermissionDenied
+from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
 from django.template import RequestContext
-from django.contrib import messages
-from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
-from django.core.exceptions import PermissionDenied
 
-from permissions import Permission
-from taggit.models import Tag
-from documents.models import Document
-from documents.views import document_list
-from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from acls.models import AccessEntry
 from acls.views import acl_list_for
 from acls.utils import apply_default_acls
+from documents.models import Document
+from documents.views import document_list
+from documents.permissions import PERMISSION_DOCUMENT_VIEW
+from permissions import Permission
+from taggit.models import Tag
 
 from .forms import TagListForm, TagForm
 from .models import TagProperties