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

apps/document_indexing/api.py

@@ -87,7 +87,7 @@ def cascade_eval(eval_dict, document, template_node, parent_index_instance=None)
         else:
             if result:
                 index_instance, created = IndexInstanceNode.objects.get_or_create(index_template_node=template_node, value=result, parent=parent_index_instance)
-                #if created:
+                # if created:
                 try:
                     fs_create_index_directory(index_instance)
                 except Exception, exc:

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):
@@ -38,6 +37,6 @@ index_list = {'text': _(u'index list'), 'view': 'index_list', 'famfam': 'tab', '
 index_parent = {'text': _(u'go up one level'), 'view': 'index_instance_node_view', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True, 'condition': is_not_instance_root_node}
 document_index_list = {'text': _(u'indexes'), 'view': 'document_index_list', 'args': 'object.pk', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW, PERMISSION_DOCUMENT_VIEW]}
 
-document_index_main_menu_link={'text': _('indexes'), 'famfam': 'tab', 'view': 'index_list', 'children_view_regex': [r'^index_[i,l]']}
+document_index_main_menu_link = {'text': _('indexes'), 'famfam': 'tab', 'view': 'index_list', 'children_view_regex': [r'^index_[i,l]']}
 
 rebuild_index_instances = {'text': _('rebuild indexes'), 'view': 'rebuild_index_instances', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES], 'description': _(u'Deletes and creates from scratch all the document indexes.')}

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
 
@@ -68,7 +68,7 @@ class IndexTemplateNode(MPTTModel):
     parent = TreeForeignKey('self', null=True, blank=True, related_name='index_template_node')
     index = models.ForeignKey(Index, verbose_name=_(u'index'))
     expression = models.CharField(max_length=128, verbose_name=_(u'indexing expression'), help_text=_(u'Enter a python string expression to be evaluated.'))
-        # % available_indexing_functions_string)
+    # % available_indexing_functions_string)
     enabled = models.BooleanField(default=True, verbose_name=_(u'enabled'), help_text=_(u'Causes this node to be visible and updated when document data changes.'))
     link_documents = models.BooleanField(default=False, verbose_name=_(u'link documents'), help_text=_(u'Check this option to have this node act as a container for documents and not as a parent for further nodes.'))
 
@@ -82,7 +82,7 @@ class IndexTemplateNode(MPTTModel):
     class Meta:
         verbose_name = _(u'index template node')
         verbose_name_plural = _(u'indexes template nodes')
-    
+
 
 class IndexInstanceNode(MPTTModel):
     parent = TreeForeignKey('self', null=True, blank=True, related_name='index_instance_node')

apps/document_indexing/urls.py

@@ -7,7 +7,7 @@ urlpatterns = patterns('document_indexing.views',
     url(r'^setup/index/(?P<index_pk>\d+)/delete/$', 'index_setup_delete', (), 'index_setup_delete'),
     url(r'^setup/index/(?P<index_pk>\d+)/view/$', 'index_setup_view', (), 'index_setup_view'),
     url(r'^setup/index/(?P<index_pk>\d+)/document_types/$', 'index_setup_document_types', (), 'index_setup_document_types'),
-    
+
     url(r'^setup/template/node/(?P<parent_pk>\d+)/create/child/$', 'template_node_create', (), 'template_node_create'),
     url(r'^setup/template/node/(?P<node_pk>\d+)/edit/$', 'template_node_edit', (), 'template_node_edit'),
     url(r'^setup/template/node/(?P<node_pk>\d+)/delete/$', 'template_node_delete', (), 'template_node_delete'),

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 acls.models import AccessEntry
+from permissions.models import Permission
 
 from .forms import IndexForm, IndexTemplateNodeForm
 from .models import (Index, IndexTemplateNode, IndexInstanceNode)
@@ -167,7 +167,7 @@ def index_setup_view(request, index_pk):
         'extra_columns': [
             {'name': _(u'level'), 'attribute': encapsulate(lambda x: node_level(x))},
             {'name': _(u'enabled'), 'attribute': encapsulate(lambda x: two_state_template(x.enabled))},
-            {'name': _(u'has document links?'), 'attribute': encapsulate(lambda x: two_state_template(x.link_documents))},            
+            {'name': _(u'has document links?'), 'attribute': encapsulate(lambda x: two_state_template(x.link_documents))},
         ],
     }
 

apps/document_indexing/widgets.py

@@ -54,7 +54,7 @@ def get_breadcrumbs(index_instance, simple=False, single_link=False, include_cou
         # Return the entire breadcrumb path as a single HTML anchor
         simple = True
 
-    #result.append(get_instance_link(index_instance.get_root(), simple=simple))
+    # result.append(get_instance_link(index_instance.get_root(), simple=simple))
 
     for instance in index_instance.get_ancestors():
         result.append(get_instance_link(instance, simple=simple))