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

mayan/apps/common/__init__.py

@@ -13,13 +13,13 @@ from south.signals import post_migrate
 
 from navigation.api import register_links, register_top_menu
 
-from .conf import settings as common_settings
-from .conf.settings import (AUTO_ADMIN_USERNAME, AUTO_ADMIN_PASSWORD,
-                            AUTO_CREATE_ADMIN, TEMPORARY_DIRECTORY)
+from common import settings as common_settings
 from .links import (link_about, link_current_user_details,
                     link_current_user_edit, link_license,
                     link_password_change)
 from .models import AnonymousUserSingleton, AutoAdminSingleton
+from .settings import (AUTO_ADMIN_USERNAME, AUTO_ADMIN_PASSWORD,
+                       AUTO_CREATE_ADMIN, TEMPORARY_DIRECTORY)
 from .utils import validate_path
 
 logger = logging.getLogger(__name__)

mayan/apps/common/middleware/login_required_middleware.py

@@ -6,7 +6,7 @@ from django.http import HttpResponseRedirect
 from django.conf import settings
 from django.core.urlresolvers import reverse
 
-from ..conf.settings import ALLOW_ANONYMOUS_ACCESS
+from ..settings import ALLOW_ANONYMOUS_ACCESS
 
 EXEMPT_URLS = [re.compile(reverse(settings.LOGIN_URL).lstrip('/'))]
 if hasattr(settings, 'LOGIN_EXEMPT_URLS'):

mayan/apps/common/settings.py

@@ -9,7 +9,7 @@ from common.literals import PAGE_SIZE_LETTER, PAGE_ORIENTATION_PORTRAIT
 
 TEMPORARY_DIRECTORY = register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'TEMPORARY_DIRECTORY',
     global_name=u'COMMON_TEMPORARY_DIRECTORY',
     default=u'/tmp',
@@ -19,7 +19,7 @@ TEMPORARY_DIRECTORY = register_setting(
 
 DEFAULT_PAPER_SIZE = register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'DEFAULT_PAPER_SIZE',
     global_name=u'COMMON_DEFAULT_PAPER_SIZE',
     default=PAGE_SIZE_LETTER,
@@ -27,7 +27,7 @@ DEFAULT_PAPER_SIZE = register_setting(
 
 DEFAULT_PAGE_ORIENTATION = register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'DEFAULT_PAGE_ORIENTATION',
     global_name=u'COMMON_DEFAULT_PAGE_ORIENTATION',
     default=PAGE_ORIENTATION_PORTRAIT,
@@ -35,7 +35,7 @@ DEFAULT_PAGE_ORIENTATION = register_setting(
 
 register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'AUTO_CREATE_ADMIN',
     global_name=u'COMMON_AUTO_CREATE_ADMIN',
     default=True,
@@ -43,7 +43,7 @@ register_setting(
 
 register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'AUTO_ADMIN_USERNAME',
     global_name=u'COMMON_AUTO_ADMIN_USERNAME',
     default=u'admin',
@@ -51,7 +51,7 @@ register_setting(
 
 register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'AUTO_ADMIN_PASSWORD',
     global_name=u'COMMON_AUTO_ADMIN_PASSWORD',
     default=User.objects.make_random_password(),
@@ -59,7 +59,7 @@ register_setting(
 
 register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'LOGIN_METHOD',
     global_name=u'COMMON_LOGIN_METHOD',
     default=u'username',
@@ -68,7 +68,7 @@ register_setting(
 
 register_setting(
     namespace=u'common',
-    module=u'common.conf.settings',
+    module=u'common.settings',
     name=u'ALLOW_ANONYMOUS_ACCESS',
     global_name=u'COMMON_ALLOW_ANONYMOUS_ACCESS',
     default=False,

mayan/apps/common/views.py

@@ -18,9 +18,9 @@ from django.views.generic.list import ListView
 
 from permissions.models import Permission
 
-from .conf.settings import LOGIN_METHOD
 from .forms import (ChoiceForm, UserForm, UserForm_view, LicenseForm,
     EmailAuthenticationForm)
+from .settings import LOGIN_METHOD
 
 
 def multi_object_action_view(request):

mayan/apps/converter/api.py

@@ -6,15 +6,15 @@ import os
 
 from django.utils.encoding import smart_str
 
-from common.conf.settings import TEMPORARY_DIRECTORY
+from common.settings import TEMPORARY_DIRECTORY
 from common.utils import fs_cleanup
 
 from .exceptions import OfficeConversionError, UnknownFileFormat
-from .literals import (DEFAULT_PAGE_NUMBER,
-    DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, DEFAULT_FILE_FORMAT)
-from .literals import (TRANSFORMATION_CHOICES, TRANSFORMATION_RESIZE,
-    TRANSFORMATION_ROTATE, TRANSFORMATION_ZOOM, DIMENSION_SEPARATOR,
-    FILE_FORMATS)
+from .literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ZOOM_LEVEL,
+                       DEFAULT_ROTATION, DEFAULT_FILE_FORMAT,
+                       TRANSFORMATION_CHOICES, TRANSFORMATION_RESIZE,
+                       TRANSFORMATION_ROTATE, TRANSFORMATION_ZOOM,
+                       DIMENSION_SEPARATOR, FILE_FORMATS)
 from .runtime import backend, office_converter
 
 HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()

mayan/apps/converter/backends/graphicsmagick.py

@@ -4,12 +4,12 @@ import subprocess
 import re
 
 from . import ConverterBase
-from ..conf.settings import GM_PATH, GM_SETTINGS
 from ..exceptions import ConvertError, UnknownFileFormat, IdentifyError
 from ..literals import (TRANSFORMATION_RESIZE,
     TRANSFORMATION_ROTATE, TRANSFORMATION_ZOOM)
 from ..literals import (DIMENSION_SEPARATOR, DEFAULT_PAGE_NUMBER,
     DEFAULT_FILE_FORMAT)
+from ..settings import GM_PATH, GM_SETTINGS
 
 CONVERTER_ERROR_STRING_NO_DECODER = u'No decode delegate for this image format'
 CONVERTER_ERROR_STARTS_WITH = u'starts with'

mayan/apps/converter/backends/imagemagick.py

@@ -4,11 +4,11 @@ import subprocess
 import re
 
 from . import ConverterBase
-from ..conf.settings import IM_CONVERT_PATH, IM_IDENTIFY_PATH
 from ..exceptions import ConvertError, UnknownFileFormat, IdentifyError
 from ..literals import (TRANSFORMATION_RESIZE, TRANSFORMATION_ROTATE,
     TRANSFORMATION_ZOOM, DIMENSION_SEPARATOR, DEFAULT_PAGE_NUMBER,
     DEFAULT_FILE_FORMAT)
+from ..settings import IM_CONVERT_PATH, IM_IDENTIFY_PATH
 
 CONVERTER_ERROR_STRING_NO_DECODER = u'no decode delegate for this image format'
 

mayan/apps/converter/office_converter.py

@@ -4,11 +4,11 @@ import logging
 import os
 import subprocess
 
-from common.conf.settings import TEMPORARY_DIRECTORY
+from common.settings import TEMPORARY_DIRECTORY
 from mimetype.api import get_mimetype
 
-from .conf.settings import LIBREOFFICE_PATH
 from .exceptions import OfficeBackendError, UnknownFileFormat
+from .settings import LIBREOFFICE_PATH
 
 CACHED_FILE_SUFFIX = u'_office_converter'
 

mayan/apps/converter/runtime.py

@@ -2,9 +2,9 @@ from __future__ import absolute_import
 
 from common.utils import load_backend
 
-from .conf.settings import GRAPHICS_BACKEND
 from .exceptions import OfficeBackendError
 from .office_converter import OfficeConverter
+from .settings import GRAPHICS_BACKEND
 
 try:
     office_converter = OfficeConverter()

mayan/apps/converter/settings.py

@@ -6,7 +6,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'converter',
-    module=u'converter.conf.settings',
+    module=u'converter.settings',
     settings=[
         {'name': u'IM_CONVERT_PATH', 'global_name': u'CONVERTER_IM_CONVERT_PATH', 'default': u'/usr/bin/convert', 'description': _(u'File path to imagemagick\'s convert program.'), 'exists': True},
         {'name': u'IM_IDENTIFY_PATH', 'global_name': u'CONVERTER_IM_IDENTIFY_PATH', 'default': u'/usr/bin/identify', 'description': _(u'File path to imagemagick\'s identify program.'), 'exists': True},

mayan/apps/converter/views.py

@@ -8,7 +8,7 @@ from django.utils.translation import ugettext_lazy as _
 from common.utils import encapsulate
 
 from .api import get_format_list
-from .conf.settings import GRAPHICS_BACKEND
+from .settings import GRAPHICS_BACKEND
 
 
 def formats_list(request):

mayan/apps/django_gpg/runtime.py

@@ -3,7 +3,7 @@ from __future__ import absolute_import
 import sys
 
 from .api import GPG
-from .conf.settings import KEYSERVERS, GPG_HOME
+from .settings import KEYSERVERS, GPG_HOME
 
 try:
     gpg = GPG(home=GPG_HOME, keyservers=KEYSERVERS)

mayan/apps/django_gpg/settings.py

@@ -10,7 +10,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'django_gpg',
-    module=u'django_gpg.conf.settings',
+    module=u'django_gpg.settings',
     settings=[
         {'name': u'KEYSERVERS', 'global_name': u'SIGNATURES_KEYSERVERS', 'default': ['pool.sks-keyservers.net'], 'description': _(u'List of keyservers to be queried for unknown keys.')},
         {'name': u'GPG_HOME', 'global_name': u'SIGNATURES_GPG_HOME', 'default': os.path.join(settings.MEDIA_ROOT, u'gpg_home'), 'description': _(u'Home directory used to store keys as well as configuration files.')},

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},

mayan/apps/documents/__init__.py

@@ -17,8 +17,7 @@ from project_setup.api import register_setup
 from rest_api.classes import APIEndPoint
 from statistics.classes import StatisticNamespace
 
-from .conf import settings as document_settings
-from .conf.settings import THUMBNAIL_SIZE
+from documents import settings as document_settings
 from .events import (HISTORY_DOCUMENT_CREATED,
     HISTORY_DOCUMENT_EDITED, HISTORY_DOCUMENT_DELETED)
 from .links import (document_list, document_list_recent,
@@ -46,6 +45,7 @@ from .permissions import (
     PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD,
     PERMISSION_DOCUMENT_TRANSFORM, PERMISSION_DOCUMENT_EDIT,
     PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_NEW_VERSION)
+from .settings import THUMBNAIL_SIZE
 from .statistics import DocumentStatistics, DocumentUsageStatistics
 from .urls import api_urls
 from .widgets import document_thumbnail

mayan/apps/documents/api_views.py

@@ -14,7 +14,6 @@ from permissions.models import Permission
 from rest_api.filters import MayanObjectPermissionsFilter
 from rest_api.permissions import MayanPermission
 
-from .conf.settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
 from .models import Document, DocumentPage, DocumentVersion
 from .permissions import (PERMISSION_DOCUMENT_CREATE,
                           PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_EDIT,
@@ -23,6 +22,7 @@ from .permissions import (PERMISSION_DOCUMENT_CREATE,
                           PERMISSION_DOCUMENT_VIEW)
 from .serializers import (DocumentImageSerializer, DocumentPageSerializer,
                           DocumentSerializer, DocumentVersionSerializer)
+from .settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
 
 
 class APIDocumentListView(generics.ListCreateAPIView):

mayan/apps/documents/links.py

@@ -4,7 +4,6 @@ from django.utils.translation import ugettext_lazy as _
 
 from history.permissions import PERMISSION_HISTORY_VIEW
 
-from .conf.settings import ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
 from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
                           PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_DELETE,
                           PERMISSION_DOCUMENT_DOWNLOAD, PERMISSION_DOCUMENT_TRANSFORM,
@@ -12,6 +11,7 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
                           PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_TYPE_EDIT,
                           PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_CREATE,
                           PERMISSION_DOCUMENT_TYPE_VIEW)
+from .settings import ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL
 
 # Document page links expressions
 

mayan/apps/documents/managers.py

@@ -5,7 +5,7 @@ from ast import literal_eval
 from django.db import models
 from django.utils.timezone import now
 
-from .conf.settings import RECENT_COUNT
+from .settings import RECENT_COUNT
 
 
 class DocumentPageTransformationManager(models.Manager):

mayan/apps/documents/models.py

@@ -26,8 +26,6 @@ from converter.literals import (DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION,
                                 DEFAULT_PAGE_NUMBER)
 from mimetype.api import get_mimetype
 
-from .conf.settings import (CACHE_PATH, CHECKSUM_FUNCTION, DISPLAY_SIZE,
-                            UUID_FUNCTION, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
 from .exceptions import NewDocumentVersionNotAllowed
 from .literals import (RELEASE_LEVEL_CHOICES, RELEASE_LEVEL_FINAL,
                        VERSION_UPDATE_MAJOR, VERSION_UPDATE_MICRO,
@@ -35,6 +33,8 @@ from .literals import (RELEASE_LEVEL_CHOICES, RELEASE_LEVEL_FINAL,
 from .managers import (DocumentPageTransformationManager, DocumentTypeManager,
                        RecentDocumentManager)
 from .runtime import storage_backend
+from .settings import (CACHE_PATH, CHECKSUM_FUNCTION, DISPLAY_SIZE,
+                       UUID_FUNCTION, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
 from .utils import document_save_to_temp_dir
 
 # document image cache name hash function

mayan/apps/documents/runtime.py

@@ -2,6 +2,6 @@ from __future__ import absolute_import
 
 from common.utils import load_backend
 
-from .conf.settings import STORAGE_BACKEND
+from .settings import STORAGE_BACKEND
 
 storage_backend = load_backend(STORAGE_BACKEND)()

mayan/apps/documents/settings.py

@@ -22,7 +22,7 @@ def default_uuid():
 
 register_settings(
     namespace=u'documents',
-    module=u'documents.conf.settings',
+    module=u'documents.settings',
     settings=[
         # Saving
         {'name': u'CHECKSUM_FUNCTION', 'global_name': u'DOCUMENTS_CHECKSUM_FUNCTION', 'default': default_checksum},

mayan/apps/documents/urls.py

@@ -5,7 +5,7 @@ from django.conf.urls import patterns, url
 from .api_views import (APIDocumentView, APIDocumentImageView, APIDocumentListView,
                         APIDocumentPageView, APIDocumentVersionCreateView,
                         APIDocumentVersionView)
-from .conf.settings import PRINT_SIZE, DISPLAY_SIZE
+from .settings import PRINT_SIZE, DISPLAY_SIZE
 
 urlpatterns = patterns('documents.views',
     url(r'^list/$', 'document_list', (), 'document_list'),

mayan/apps/documents/utils.py

@@ -1,6 +1,6 @@
 import os
 
-from common.conf.settings import TEMPORARY_DIRECTORY
+from common.settings import TEMPORARY_DIRECTORY
 
 
 def document_save_to_temp_dir(document, filename, buffer_size=1024 * 1024):

mayan/apps/documents/views.py

@@ -20,10 +20,10 @@ from acls.models import AccessEntry
 from common.compressed_files import CompressedFile
 from common.literals import (PAGE_ORIENTATION_LANDSCAPE, PAGE_ORIENTATION_PORTRAIT,
                              PAGE_SIZE_DIMENSIONS)
+from common.settings import DEFAULT_PAPER_SIZE
 from common.utils import (encapsulate, pretty_size, parse_range, return_diff,
                           urlquote)
 from common.widgets import two_state_template
-from common.conf.settings import DEFAULT_PAPER_SIZE
 from converter.literals import (DEFAULT_FILE_FORMAT_MIMETYPE, DEFAULT_PAGE_NUMBER,
                                 DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL)
 from converter.office_converter import OfficeConverter
@@ -33,8 +33,6 @@ from navigation.utils import resolve_to_name
 from permissions.models import Permission
 
 from .events import HISTORY_DOCUMENT_EDITED
-from .conf.settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP,
-                            ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
 from .forms import (DocumentForm_edit, DocumentPropertiesForm,
                     DocumentPreviewForm, DocumentPageForm,
                     DocumentPageTransformationForm, DocumentContentForm,
@@ -52,6 +50,8 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
                           PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_CREATE,
                           PERMISSION_DOCUMENT_TYPE_VIEW)
 from .runtime import storage_backend
+from .settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP,
+                       ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
 
 logger = logging.getLogger(__name__)
 

mayan/apps/documents/widgets.py

@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
 from converter.literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION,
                                 DEFAULT_ZOOM_LEVEL)
 
-from .conf.settings import DISPLAY_SIZE, MULTIPAGE_PREVIEW_SIZE, THUMBNAIL_SIZE
+from .settings import DISPLAY_SIZE, MULTIPAGE_PREVIEW_SIZE, THUMBNAIL_SIZE
 
 
 class DocumentPageImageWidget(forms.widgets.Widget):

mayan/apps/dynamic_search/api.py

@@ -8,7 +8,7 @@ import types
 
 from django.db.models import Q
 
-from .conf.settings import LIMIT
+from .settings import LIMIT
 
 registered_search_dict = {}
 

mayan/apps/dynamic_search/classes.py

@@ -7,7 +7,7 @@ import re
 from django.db.models import Q
 from django.db.models.loading import get_model
 
-from .conf.settings import LIMIT
+from .settings import LIMIT
 
 logger = logging.getLogger(__name__)
 

mayan/apps/dynamic_search/managers.py

@@ -6,7 +6,7 @@ from django.contrib.auth.models import AnonymousUser
 from django.db import models
 from django.utils.http import urlencode
 
-from .conf.settings import RECENT_COUNT
+from .settings import RECENT_COUNT
 
 
 class RecentSearchManager(models.Manager):

mayan/apps/dynamic_search/settings.py

@@ -6,7 +6,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'dynamic_search',
-    module=u'dynamic_search.conf.settings',
+    module=u'dynamic_search.settings',
     settings=[
         {'name': u'SHOW_OBJECT_TYPE', 'global_name': u'SEARCH_SHOW_OBJECT_TYPE', 'default': True, 'hidden': True},
         {'name': u'LIMIT', 'global_name': u'SEARCH_LIMIT', 'default': 100, 'description': _(u'Maximum amount search hits to fetch and display.')},

mayan/apps/dynamic_search/templatetags/search_tags.py

@@ -4,7 +4,7 @@ from django.utils.translation import ugettext as _
 
 from dynamic_search.forms import SearchForm
 from dynamic_search.models import RecentSearch
-from dynamic_search.conf.settings import RECENT_COUNT
+from dynamic_search.settings import RECENT_COUNT
 
 register = Library()
 

mayan/apps/dynamic_search/views.py

@@ -10,9 +10,9 @@ from django.template import RequestContext
 from django.utils.translation import ugettext_lazy as _
 
 from .classes import SearchModel
-from .conf.settings import LIMIT, SHOW_OBJECT_TYPE
 from .forms import SearchForm, AdvancedSearchForm
 from .models import RecentSearch
+from .settings import LIMIT, SHOW_OBJECT_TYPE
 
 logger = logging.getLogger(__name__)
 document_search = SearchModel.get('documents.Document')

mayan/apps/installation/models.py

@@ -29,7 +29,7 @@ from solo.models import SingletonModel
 from common.utils import pretty_size
 from mayan import __version__ as mayan_version
 from lock_manager import Lock, LockError
-from ocr.conf.settings import TESSERACT_PATH, UNPAPER_PATH, PDFTOTEXT_PATH
+from ocr.settings import TESSERACT_PATH, UNPAPER_PATH, PDFTOTEXT_PATH
 
 from .classes import Property, PropertyNamespace, VirtualEnv, PIPNotFound
 from .literals import (FORM_SUBMIT_URL, FORM_KEY, FORM_RECEIVER_FIELD,

mayan/apps/linking/forms.py

@@ -7,7 +7,7 @@ from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext
 
 from documents.widgets import document_html_widget
-from documents.conf.settings import MULTIPAGE_PREVIEW_SIZE
+from documents.settings import MULTIPAGE_PREVIEW_SIZE
 from tags.widgets import get_tags_inline_widget
 
 from .models import SmartLink, SmartLinkCondition

mayan/apps/linking/settings.py

@@ -6,7 +6,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'linking',
-    module=u'linking.conf.settings',
+    module=u'linking.settings',
     settings=[
         {'name': u'SHOW_EMPTY_SMART_LINKS', 'global_name': u'LINKING_SHOW_EMPTY_SMART_LINKS', 'default': True, 'description': _(u'Show smart link that don\'t return any documents.')},
     ]

mayan/apps/linking/views.py

@@ -20,7 +20,6 @@ from documents.views import document_list
 from documents.permissions import PERMISSION_DOCUMENT_VIEW
 from permissions.models import Permission
 
-from .conf.settings import SHOW_EMPTY_SMART_LINKS
 from .forms import (SmartLinkInstanceForm, SmartLinkForm,
     SmartLinkConditionForm)
 from .links import smart_link_instance_view_link
@@ -28,6 +27,7 @@ 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 .settings import SHOW_EMPTY_SMART_LINKS
 
 logger = logging.getLogger(__name__)
 

mayan/apps/lock_manager/models.py

@@ -5,7 +5,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.utils.timezone import now
 
 from .managers import LockManager
-from .conf.settings import DEFAULT_LOCK_TIMEOUT
+from .settings import DEFAULT_LOCK_TIMEOUT
 
 
 class Lock(models.Model):

mayan/apps/main/__init__.py

@@ -1,23 +1,23 @@
 from __future__ import absolute_import
 
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
+from django.conf import settings as django_settings
 
 from navigation.api import register_top_menu
 from project_setup.api import register_setup
 from project_tools.api import register_tool
 
-from .conf.settings import DISABLE_HOME_VIEW
 from .links import admin_site, diagnostics, maintenance_menu, sentry
+from .settings import DISABLE_HOME_VIEW
 
 if not DISABLE_HOME_VIEW:
     register_top_menu('home', link={'text': _(u'home'), 'view': 'main:home', 'famfam': 'house'}, position=0)
 
-if 'django.contrib.admin' in settings.INSTALLED_APPS:
+if 'django.contrib.admin' in django_settings.INSTALLED_APPS:
     register_setup(admin_site)
 
 register_tool(diagnostics)
 register_tool(maintenance_menu)
 
-if 'sentry' in settings.INSTALLED_APPS:
+if 'sentry' in django_settings.INSTALLED_APPS:
     register_tool(sentry)

mayan/apps/main/settings.py

@@ -5,7 +5,7 @@ from smart_settings.api import register_setting, register_settings
 
 register_setting(
     namespace=u'main',
-    module=u'main.conf.settings',
+    module=u'main.settings',
     name=u'DISABLE_HOME_VIEW',
     global_name=u'MAIN_DISABLE_HOME_VIEW',
     default=False,
@@ -13,7 +13,7 @@ register_setting(
 
 register_setting(
     namespace=u'main',
-    module=u'main.conf.settings',
+    module=u'main.settings',
     name=u'DISABLE_ICONS',
     global_name=u'MAIN_DISABLE_ICONS',
     default=False,
@@ -21,7 +21,7 @@ register_setting(
 
 register_settings(
     namespace=u'main',
-    module=u'main.conf.settings',
+    module=u'main.settings',
     settings=[
         {'name': u'THEME', 'global_name': u'MAIN_THEME', 'default': u'activo', 'description': _(u'CSS theme to apply, options are: amro, bec, bec-green, blue, default, djime-cerulean, drastic-dark, kathleene, olive, orange, red, reidb-greenish and warehouse.')},
         {'name': u'ENABLE_SCROLL_JS', 'global_name': u'MAIN_ENABLE_SCROLL_JS', 'default': True, 'hidden': True},

mayan/apps/main/templatetags/main_settings_tags.py

@@ -1,8 +1,8 @@
 import re
 
-from django.template import Node
-from django.template import TemplateSyntaxError, Library
-from main.conf import settings
+from django.template import Library, Node, TemplateSyntaxError
+
+from main import settings
 
 register = Library()
 

mayan/apps/main/templatetags/theme_tags.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from django.template import Library, Node, TemplateSyntaxError
 from django.utils.safestring import mark_safe
 
-from ..conf import settings as web_theme_settings
+from main import settings as web_theme_settings
 
 register = Library()
 

mayan/apps/main/views.py

@@ -10,7 +10,7 @@ from django.core.urlresolvers import reverse
 from permissions.models import Permission
 
 from .api import diagnostics, tools
-from .conf.settings import DISABLE_HOME_VIEW
+from .settings import DISABLE_HOME_VIEW
 
 
 def home(request):

mayan/apps/metadata/forms.py

@@ -6,8 +6,8 @@ from django.utils.translation import ugettext_lazy as _
 
 from common.widgets import ScrollableCheckboxSelectMultiple
 
-from .conf.settings import AVAILABLE_MODELS, AVAILABLE_FUNCTIONS
 from .models import MetadataSet, MetadataType, DocumentTypeDefaults
+from .settings import AVAILABLE_MODELS, AVAILABLE_FUNCTIONS
 
 
 class MetadataForm(forms.Form):

mayan/apps/metadata/settings.py

@@ -18,7 +18,7 @@ default_available_models = {
 
 register_settings(
     namespace=u'metadata',
-    module=u'metadata.conf.settings',
+    module=u'metadata.settings',
     settings=[
         # Definition
         {'name': u'AVAILABLE_FUNCTIONS', 'global_name': u'METADATA_AVAILABLE_FUNCTIONS', 'default': default_available_functions},

mayan/apps/ocr/__init__.py

@@ -17,7 +17,6 @@ from statistics.classes import StatisticNamespace
 
 from south.signals import post_migrate
 
-from .conf.settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
 from .exceptions import AlreadyQueued
 from .links import (submit_document, submit_document_multiple,
     re_queue_multiple_document, queue_document_multiple_delete,
@@ -27,6 +26,7 @@ from .links import (submit_document, submit_document_multiple,
 from .literals import QUEUEDOCUMENT_STATE_PENDING, QUEUEDOCUMENT_STATE_PROCESSING
 from .models import DocumentQueue
 from .permissions import PERMISSION_OCR_DOCUMENT
+from .settings import (AUTOMATIC_OCR, QUEUE_PROCESSING_INTERVAL)
 from .statistics import OCRStatistics
 from .tasks import task_process_document_queues
 

mayan/apps/ocr/api.py

@@ -8,18 +8,18 @@ import sh
 
 from django.utils.translation import ugettext as _
 
-from common.conf.settings import TEMPORARY_DIRECTORY
+from common.settings import TEMPORARY_DIRECTORY
 from common.utils import fs_cleanup
 from converter.api import convert
 from documents.models import DocumentPage
 
-from .conf.settings import UNPAPER_PATH, LANGUAGE
 from .exceptions import UnpaperError
 from .literals import (DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT,
     DEFAULT_OCR_FILE_EXTENSION)
 from .parsers import parse_document_page
 from .parsers.exceptions import ParserError, ParserUnknownFile
 from .runtime import language_backend, ocr_backend
+from .settings import UNPAPER_PATH, LANGUAGE
 
 logger = logging.getLogger(__name__)
 

mayan/apps/ocr/backends/tesseract.py

@@ -8,8 +8,8 @@ import tempfile
 from common.utils import fs_cleanup
 
 from . import BackendBase
-from ..conf.settings import TESSERACT_PATH
 from ..exceptions import OCRError
+from ..settings import TESSERACT_PATH
 
 
 class Tesseract(BackendBase):

mayan/apps/ocr/parsers/__init__.py

@@ -1,21 +1,22 @@
+import logging
 import os
 import slate
-import logging
-import tempfile
 import subprocess
+import tempfile
 
 from django.utils.translation import ugettext as _
 
-from converter import office_converter
-from converter.office_converter import OfficeConverter
-from converter.office_converter import CONVERTER_OFFICE_FILE_MIMETYPES
-from converter.exceptions import OfficeConversionError
-from documents.utils import document_save_to_temp_dir
+from common.settings import TEMPORARY_DIRECTORY
 from common.utils import copyfile
-from common.conf.settings import TEMPORARY_DIRECTORY
+from converter import office_converter
+from converter.exceptions import OfficeConversionError
+from converter.office_converter import (CONVERTER_OFFICE_FILE_MIMETYPES,
+                                        OfficeConverter)
+from documents.utils import document_save_to_temp_dir
 
-from ocr.parsers.exceptions import ParserError, ParserUnknownFile
-from ocr.conf.settings import PDFTOTEXT_PATH
+from ..settings import PDFTOTEXT_PATH
+
+from .exceptions import ParserError, ParserUnknownFile
 
 
 mimetype_registry = {}

mayan/apps/ocr/runtime.py

@@ -2,7 +2,7 @@ from __future__ import absolute_import
 
 from common.utils import load_backend
 
-from .conf.settings import BACKEND, LANGUAGE
+from .settings import BACKEND, LANGUAGE
 
 try:
     language_backend = load_backend(u'.'.join([u'ocr', u'lang', LANGUAGE, u'LanguageBackend']))()

mayan/apps/ocr/settings.py

@@ -6,7 +6,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'ocr',
-    module=u'ocr.conf.settings',
+    module=u'ocr.settings',
     settings=[
         {'name': u'TESSERACT_PATH', 'global_name': u'OCR_TESSERACT_PATH', 'default': u'/usr/bin/tesseract', 'exists': True},
         {'name': u'LANGUAGE', 'global_name': u'OCR_LANGUAGE', 'default': u'eng'},

mayan/apps/ocr/tasks.py

@@ -14,11 +14,11 @@ from job_processor.api import process_job
 from lock_manager import Lock, LockError
 
 from .api import do_document_ocr
-from .conf.settings import NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY
 from .literals import (QUEUEDOCUMENT_STATE_PENDING,
     QUEUEDOCUMENT_STATE_PROCESSING, DOCUMENTQUEUE_STATE_ACTIVE,
     QUEUEDOCUMENT_STATE_ERROR)
 from .models import QueueDocument, DocumentQueue
+from .settings import NODE_CONCURRENT_EXECUTION, REPLICATION_DELAY
 
 LOCK_EXPIRE = 60 * 2  # Lock expires in 2 minutes
 # TODO: Tie LOCK_EXPIRATION with hard task timeout

mayan/apps/permissions/__init__.py

@@ -7,10 +7,11 @@ from django.db.models.signals import post_save
 from navigation.api import register_links, register_multi_item_links
 from project_setup.api import register_setup
 
-from .conf.settings import DEFAULT_ROLES
 from .models import Role
-from .links import (role_list, role_create, role_edit, role_members, role_permissions,
-    role_delete, permission_grant, permission_revoke)
+from .links import (role_list, role_create, role_edit, role_members,
+                    role_permissions, role_delete, permission_grant,
+                    permission_revoke)
+from .settings import DEFAULT_ROLES
 
 register_links(Role, [role_edit, role_delete, role_permissions, role_members])
 register_links([Role, 'permissions:role_list', 'permissions:role_create'], [role_list, role_create], menu_name='secondary_menu')

mayan/apps/permissions/settings.py

@@ -5,7 +5,7 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'permissions',
-    module=u'permissions.conf.settings',
+    module=u'permissions.settings',
     settings=[
         {'name': u'DEFAULT_ROLES', 'global_name': u'ROLES_DEFAULT_ROLES', 'default': [], 'description': _('A list of existing roles that are automatically assigned to newly created users')},
     ]

mayan/apps/sources/api_views.py

@@ -8,7 +8,7 @@ from converter.literals import (DEFAULT_PAGE_NUMBER,
 from rest_framework import generics
 from rest_framework.response import Response
 
-from documents.conf.settings import (DISPLAY_SIZE, ZOOM_MAX_LEVEL,
+from documents.settings import (DISPLAY_SIZE, ZOOM_MAX_LEVEL,
                                 ZOOM_MIN_LEVEL)
 
 from .models import StagingFolder

mayan/apps/sources/widgets.py

@@ -7,8 +7,9 @@ from django.utils.http import urlencode
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
-from converter.literals import DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL
-from documents.conf.settings import THUMBNAIL_SIZE, PREVIEW_SIZE
+from converter.literals import (DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION,
+                                DEFAULT_ZOOM_LEVEL)
+from documents.settings import THUMBNAIL_SIZE, PREVIEW_SIZE
 
 
 class FamFamRadioFieldRenderer(forms.widgets.RadioFieldRenderer):

mayan/apps/storage/backends/compressedstorage.py

@@ -17,7 +17,7 @@ except ImportError:
 from django.core.files import File
 from django.core.files.storage import FileSystemStorage
 
-from ..conf.settings import FILESTORAGE_LOCATION
+from ..settings import FILESTORAGE_LOCATION
 
 
 class CompressedStorage(FileSystemStorage):

mayan/apps/storage/backends/filebasedstorage.py

@@ -4,7 +4,7 @@ import os
 
 from django.core.files.storage import FileSystemStorage
 
-from ..conf.settings import FILESTORAGE_LOCATION
+from ..settings import FILESTORAGE_LOCATION
 
 
 class FileBasedStorage(FileSystemStorage):

mayan/apps/storage/settings.py

@@ -7,11 +7,8 @@ from smart_settings.api import register_settings
 
 register_settings(
     namespace=u'storage',
-    module=u'storage.conf.settings',
+    module=u'storage.settings',
     settings=[
-        {'name': u'GRIDFS_HOST', 'global_name': u'STORAGE_GRIDFS_HOST', 'default': u'localhost'},
-        {'name': u'GRIDFS_PORT', 'global_name': u'STORAGE_GRIDFS_PORT', 'default': 27017},
-        {'name': u'GRIDFS_DATABASE_NAME', 'global_name': u'STORAGE_GRIDFS_DATABASE_NAME', 'default': u'document_storage'},
         {'name': u'FILESTORAGE_LOCATION', 'global_name': u'STORAGE_FILESTORAGE_LOCATION', 'default': os.path.join(settings.MEDIA_ROOT, u'document_storage'), 'exists': True},
     ]
 )