Move all settings files from <app>/conf/settings.py to <app>/settings.py

mayan/apps/document_indexing/api.py

@@ -7,13 +7,13 @@ from django.utils.translation import ugettext_lazy as _
 
 from metadata.classes import MetadataClass
 
-from .conf.settings import (AVAILABLE_INDEXING_FUNCTIONS,
-    MAX_SUFFIX_COUNT, SLUGIFY_PATHS)
 from .exceptions import MaxSuffixCountReached
-from .filesystem import (fs_create_index_directory,
-    fs_create_document_link, fs_delete_document_link,
-    fs_delete_index_directory, assemble_suffixed_filename)
+from .filesystem import (fs_create_index_directory, fs_create_document_link,
+                         fs_delete_document_link, fs_delete_index_directory,
+                         assemble_suffixed_filename)
 from .models import Index, IndexInstanceNode, DocumentRenameCount
+from .settings import (AVAILABLE_INDEXING_FUNCTIONS, MAX_SUFFIX_COUNT,
+                       SLUGIFY_PATHS)
 
 if SLUGIFY_PATHS:
     SLUGIFY_FUNCTION = slugify

mayan/apps/document_indexing/filesystem.py

@@ -5,7 +5,7 @@ import os
 
 from django.utils.translation import ugettext_lazy as _
 
-from .conf.settings import (FILESYSTEM_SERVING, SUFFIX_SEPARATOR)
+from .settings import (FILESYSTEM_SERVING, SUFFIX_SEPARATOR)
 
 
 def assemble_suffixed_filename(filename, suffix=0):

mayan/apps/document_indexing/models.py

@@ -8,8 +8,8 @@ from mptt.models import MPTTModel
 
 from documents.models import Document, DocumentType
 
-from .conf.settings import AVAILABLE_INDEXING_FUNCTIONS
 from .managers import IndexManager
+from .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''
 

mayan/apps/document_indexing/settings.py

@@ -11,7 +11,7 @@ available_indexing_functions = {
 
 register_settings(
     namespace=u'document_indexing',
-    module=u'document_indexing.conf.settings',
+    module=u'document_indexing.settings',
     settings=[
         # Definition
         {'name': u'AVAILABLE_INDEXING_FUNCTIONS', 'global_name': u'DOCUMENT_INDEXING_AVAILABLE_INDEXING_FUNCTIONS', 'default': available_indexing_functions},