diff --git a/mayan/apps/converter/backends/python.py b/mayan/apps/converter/backends/python.py index 95778f27df..f3c849a4cd 100644 --- a/mayan/apps/converter/backends/python.py +++ b/mayan/apps/converter/backends/python.py @@ -2,7 +2,6 @@ from __future__ import absolute_import import io import logging -import os import tempfile import slate diff --git a/mayan/apps/document_indexing/__init__.py b/mayan/apps/document_indexing/__init__.py index e9d71c51f3..d681f65696 100644 --- a/mayan/apps/document_indexing/__init__.py +++ b/mayan/apps/document_indexing/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from django.db.models.signals import post_save, pre_delete, post_delete +from django.db.models.signals import post_save, post_delete from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/document_indexing/api.py b/mayan/apps/document_indexing/api.py index b282c43b12..e85de16504 100644 --- a/mayan/apps/document_indexing/api.py +++ b/mayan/apps/document_indexing/api.py @@ -3,7 +3,6 @@ from __future__ import absolute_import import logging from django.db.models import Q -from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ from .models import Index, IndexInstanceNode diff --git a/mayan/apps/document_indexing/serializers.py b/mayan/apps/document_indexing/serializers.py index e8ecb5a7af..25880f427e 100644 --- a/mayan/apps/document_indexing/serializers.py +++ b/mayan/apps/document_indexing/serializers.py @@ -27,7 +27,7 @@ class IndexTemplateNodeSerializer(serializers.ModelSerializer): class IndexSerializer(serializers.ModelSerializer): node_templates = IndexTemplateNodeSerializer(read_only=True, many=True) - instance_root = IndexInstanceNodeSerializer(read_only=True)#, many=False) + instance_root = IndexInstanceNodeSerializer(read_only=True) class Meta: fields = ('id', 'name', 'title', 'enabled', 'document_types', 'node_templates', 'instance_root') diff --git a/mayan/apps/document_indexing/settings.py b/mayan/apps/document_indexing/settings.py index 81feb424eb..891bd71039 100644 --- a/mayan/apps/document_indexing/settings.py +++ b/mayan/apps/document_indexing/settings.py @@ -1,7 +1,5 @@ """Configuration options for the document_indexing app""" -from django.utils.translation import ugettext_lazy as _ - from smart_settings.api import register_settings available_indexing_functions = { diff --git a/mayan/apps/document_indexing/tests.py b/mayan/apps/document_indexing/tests.py index 9925e71b8a..49458682de 100644 --- a/mayan/apps/document_indexing/tests.py +++ b/mayan/apps/document_indexing/tests.py @@ -1,29 +1,18 @@ from __future__ import absolute_import -from json import loads -import os - -from django.conf import settings -from django.contrib.auth.models import User from django.core.files.base import File -from django.core.urlresolvers import reverse -from django.test.client import Client from django.test import TestCase -from rest_framework import status -from rest_framework.test import APIClient - from documents.models import Document, DocumentType -from documents.tests import (TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_DESCRIPTION, - TEST_DOCUMENT_TYPE) -from metadata.models import (MetadataType, DocumentMetadata, - DocumentTypeMetadataType) +from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE +from metadata.models import MetadataType, DocumentTypeMetadataType + from .models import Index, IndexInstanceNode, IndexTemplateNode class IndexTestCase(TestCase): def setUp(self): - self.document_type = DocumentType.objects.create(name=TEST_DOCUMENT_DESCRIPTION) + self.document_type = DocumentType.objects.create(name=TEST_DOCUMENT_TYPE) with open(TEST_SMALL_DOCUMENT_PATH) as file_object: self.document = Document.objects.new_document(file_object=File(file_object), document_type=self.document_type)[0].document diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 76755a53e9..b6b6d2c3b4 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -45,7 +45,6 @@ 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 .runtime import storage_backend from .settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP, ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL) from .tasks import (task_clear_image_cache, task_get_document_image, @@ -100,7 +99,6 @@ def document_properties(request, document_id): document.add_as_recent_document_for_user(request.user) - document_fields = [ {'label': _(u'Date added'), 'field': lambda x: x.date_added.date()}, {'label': _(u'Time added'), 'field': lambda x: unicode(x.date_added.time()).split('.')[0]}, diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index 67d51f23b2..2c3914bd67 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -45,7 +45,6 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget): # Reuse expensive values latest_version_pk = value.latest_version.pk - page_count = value.page_count for page in document_pages: output.append(u'
') diff --git a/mayan/apps/dynamic_search/tests.py b/mayan/apps/dynamic_search/tests.py index 28b577067b..20f9bbba81 100644 --- a/mayan/apps/dynamic_search/tests.py +++ b/mayan/apps/dynamic_search/tests.py @@ -9,11 +9,7 @@ from django.core.urlresolvers import reverse from django.test.client import Client from django.test import TestCase -from rest_framework import status -from rest_framework.test import APIClient - from documents.models import Document, DocumentType -from ocr.parsers import parse_document_page from .classes import SearchModel diff --git a/mayan/apps/dynamic_search/views.py b/mayan/apps/dynamic_search/views.py index 95e2665774..c0b266b8c6 100644 --- a/mayan/apps/dynamic_search/views.py +++ b/mayan/apps/dynamic_search/views.py @@ -3,19 +3,14 @@ from __future__ import absolute_import import logging import urlparse -from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.shortcuts import render_to_response from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from acls.models import AccessEntry -from permissions.models import Permission - from .classes import SearchModel from .forms import SearchForm, AdvancedSearchForm -from .models import RecentSearch from .settings import LIMIT, SHOW_OBJECT_TYPE logger = logging.getLogger(__name__) diff --git a/mayan/apps/installation/literals.py b/mayan/apps/installation/literals.py index 49392c0d56..685d69c302 100644 --- a/mayan/apps/installation/literals.py +++ b/mayan/apps/installation/literals.py @@ -1,8 +1,3 @@ -import os - -from django.conf import settings - - FORM_SUBMIT_URL = 'https://docs.google.com/spreadsheet/formResponse' FORM_KEY = 'dGZrYkw3SDl5OENMTG15emp1UFFEUWc6MQ' FORM_RECEIVER_FIELD = 'entry.0.single' diff --git a/mayan/apps/lock_manager/__init__.py b/mayan/apps/lock_manager/__init__.py index 61fe7fbf78..0f834c7d6b 100644 --- a/mayan/apps/lock_manager/__init__.py +++ b/mayan/apps/lock_manager/__init__.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -from .exceptions import LockError +from .exceptions import LockError # NOQA from .models import Lock as LockModel Lock = LockModel.objects diff --git a/mayan/apps/metadata/classes.py b/mayan/apps/metadata/classes.py index 49bf81d41c..467b8e1c9e 100644 --- a/mayan/apps/metadata/classes.py +++ b/mayan/apps/metadata/classes.py @@ -1,7 +1,6 @@ from django.utils.translation import ugettext_lazy as _ -from .models import DocumentTypeMetadataType, MetadataType -from .tasks import task_add_required_metadata_type, task_remove_metadata_type +from .models import MetadataType class DocumentMetadataHelper(object): diff --git a/mayan/apps/metadata/forms.py b/mayan/apps/metadata/forms.py index 5313f3bddd..dc0bdbe79f 100644 --- a/mayan/apps/metadata/forms.py +++ b/mayan/apps/metadata/forms.py @@ -85,4 +85,5 @@ MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0) class MetadataTypeForm(forms.ModelForm): class Meta: + fields = ('name', 'title', 'default', 'lookup') model = MetadataType diff --git a/mayan/apps/ocr/tests.py b/mayan/apps/ocr/tests.py index 1c7f266de1..a6f48f4c4a 100644 --- a/mayan/apps/ocr/tests.py +++ b/mayan/apps/ocr/tests.py @@ -1,13 +1,11 @@ from __future__ import absolute_import -from django.conf import settings from django.core.files.base import File from django.test import TransactionTestCase from documents.models import Document, DocumentType from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE -from .api import do_document_ocr from .models import DocumentQueue, QueueDocument diff --git a/mayan/apps/permissions/forms.py b/mayan/apps/permissions/forms.py index b0a6a89008..64cd5dd5df 100644 --- a/mayan/apps/permissions/forms.py +++ b/mayan/apps/permissions/forms.py @@ -9,9 +9,11 @@ from .models import Role class RoleForm(forms.ModelForm): class Meta: + fields = ('name', 'label') model = Role class RoleForm_view(DetailForm): class Meta: + fields = ('name', 'label') model = Role diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index 876e72e482..780551e684 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -2,8 +2,7 @@ from __future__ import absolute_import from django.contrib.auth.models import Group, User -from rest_framework import generics, views -from rest_framework.response import Response +from rest_framework import generics from rest_api.filters import MayanObjectPermissionsFilter from rest_api.permissions import MayanPermission