Cleanups, permissions separation into explicit module, absolute import update

apps/document_indexing/__init__.py

@@ -1,19 +1,18 @@
+from __future__ import absolute_import
+
 from django.utils.translation import ugettext_lazy as _
 
 from navigation.api import register_top_menu, register_sidebar_template, \
     register_links
-from permissions.models import PermissionNamespace, Permission
 
 from main.api import register_maintenance_links
-from documents.literals import PERMISSION_DOCUMENT_VIEW
+from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
 
-from document_indexing.models import IndexInstance
+from .models import IndexInstance
+from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
+    PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
 
-document_indexing_namespace = PermissionNamespace('document_indexing', _(u'Indexing'))
-
-PERMISSION_DOCUMENT_INDEXING_VIEW = Permission.objects.register(document_indexing_namespace, 'document_index_view', _(u'View document indexes'))
-PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES = Permission.objects.register(document_indexing_namespace, 'document_rebuild_indexes', _(u'Rebuild document indexes'))
 
 index_list = {'text': _(u'index list'), 'view': 'index_instance_list', 'famfam': 'folder_page', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW]}
 index_parent = {'text': _(u'go up one level'), 'view': 'index_instance_list', 'args': 'object.parent.pk', 'famfam': 'arrow_up', 'permissions': [PERMISSION_DOCUMENT_INDEXING_VIEW], 'dont_mark_active': True}

apps/document_indexing/api.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.utils.translation import ugettext_lazy as _
 from django.utils.translation import ugettext
 from django.core.urlresolvers import reverse
@@ -7,15 +9,13 @@ from django.template.defaultfilters import slugify
 from documents.models import Document
 from metadata.classes import MetadataObject
 
-from document_indexing.models import Index, IndexInstance, \
-    DocumentRenameCount
-from document_indexing.conf.settings import AVAILABLE_INDEXING_FUNCTIONS
-from document_indexing.conf.settings import MAX_SUFFIX_COUNT
-from document_indexing.filesystem import fs_create_index_directory, \
-    fs_create_document_link, fs_delete_document_link, \
-    fs_delete_index_directory, fs_delete_directory_recusive
-from document_indexing.conf.settings import SLUGIFY_PATHS
-from document_indexing.os_specifics import assemble_suffixed_filename
+from .models import (Index, IndexInstance, DocumentRenameCount)
+from .conf.settings import (AVAILABLE_INDEXING_FUNCTIONS,
+    MAX_SUFFIX_COUNT, SLUGIFY_PATHS)
+from .filesystem import (fs_create_index_directory,
+    fs_create_document_link, fs_delete_document_link,
+    fs_delete_index_directory, fs_delete_directory_recusive)
+from .os_specifics import assemble_suffixed_filename
 
 if SLUGIFY_PATHS == False:
     # Do not slugify path or filenames and extensions

apps/document_indexing/filesystem.py

@@ -1,12 +1,13 @@
+from __future__ import absolute_import
+
 import errno
 import os
 
 from django.utils.translation import ugettext_lazy as _
 
-from document_indexing.os_specifics import (assemble_suffixed_filename,
+from .os_specifics import (assemble_suffixed_filename,
     assemble_path_from_list)
-from document_indexing.conf.settings import FILESERVING_ENABLE
-from document_indexing.conf.settings import FILESERVING_PATH
+from .conf.settings import (FILESERVING_ENABLE, FILESERVING_PATH)
 
 
 def get_instance_path(index_instance):

apps/document_indexing/models.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
@@ -6,7 +8,7 @@ from mptt.fields import TreeForeignKey
 
 from documents.models import Document
 
-from document_indexing.conf.settings import AVAILABLE_INDEXING_FUNCTIONS
+from .conf.settings import AVAILABLE_INDEXING_FUNCTIONS
 
 available_indexing_functions_string = (_(u'Available functions: %s') % u','.join([u'%s()' % name for name, function in AVAILABLE_INDEXING_FUNCTIONS.items()])) if AVAILABLE_INDEXING_FUNCTIONS else u''
 

apps/document_indexing/os_specifics.py

@@ -1,6 +1,8 @@
+from __future__ import absolute_import
+
 import os
 
-from document_indexing.conf.settings import SUFFIX_SEPARATOR
+from .conf.settings import SUFFIX_SEPARATOR
 
 
 def assemble_suffixed_filename(filename, suffix=0):

apps/document_indexing/permissions.py

@@ -0,0 +1,10 @@
+from __future__ import absolute_import
+
+from django.utils.translation import ugettext_lazy as _
+
+from permissions.models import PermissionNamespace, Permission
+
+document_indexing_namespace = PermissionNamespace('document_indexing', _(u'Indexing'))
+
+PERMISSION_DOCUMENT_INDEXING_VIEW = Permission.objects.register(document_indexing_namespace, 'document_index_view', _(u'View document indexes'))
+PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES = Permission.objects.register(document_indexing_namespace, 'document_rebuild_indexes', _(u'Rebuild document indexes'))

apps/document_indexing/views.py

@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 from django.utils.translation import ugettext_lazy as _
 from django.http import HttpResponseRedirect
 from django.shortcuts import render_to_response, get_object_or_404
@@ -6,18 +8,17 @@ from django.contrib import messages
 from django.utils.safestring import mark_safe
 
 from permissions.models import Permission
-from documents.literals import PERMISSION_DOCUMENT_VIEW
+from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from documents.models import Document
 from documents.views import document_list
 from common.utils import encapsulate
 
-from document_indexing import (PERMISSION_DOCUMENT_INDEXING_VIEW,
+from .permissions import (PERMISSION_DOCUMENT_INDEXING_VIEW,
     PERMISSION_DOCUMENT_INDEXING_REBUILD_INDEXES)
-
-from document_indexing.models import IndexInstance
-from document_indexing.api import (get_breadcrumbs, get_instance_link,
+from .models import IndexInstance
+from .api import (get_breadcrumbs, get_instance_link,
     do_rebuild_all_indexes)
-from document_indexing.widgets import index_instance_item_link
+from .widgets import index_instance_item_link
 
 
 def index_instance_list(request, index_id=None):