Remove unused imports, do PEP8 and DeprecationWarning cleanups
This commit is contained in:
@@ -2,7 +2,6 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
import io
|
import io
|
||||||
import logging
|
import logging
|
||||||
import os
|
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
import slate
|
import slate
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
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.dispatch import receiver
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ from __future__ import absolute_import
|
|||||||
import logging
|
import logging
|
||||||
|
|
||||||
from django.db.models import Q
|
from django.db.models import Q
|
||||||
from django.utils.translation import ugettext
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from .models import Index, IndexInstanceNode
|
from .models import Index, IndexInstanceNode
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ class IndexTemplateNodeSerializer(serializers.ModelSerializer):
|
|||||||
|
|
||||||
class IndexSerializer(serializers.ModelSerializer):
|
class IndexSerializer(serializers.ModelSerializer):
|
||||||
node_templates = IndexTemplateNodeSerializer(read_only=True, many=True)
|
node_templates = IndexTemplateNodeSerializer(read_only=True, many=True)
|
||||||
instance_root = IndexInstanceNodeSerializer(read_only=True)#, many=False)
|
instance_root = IndexInstanceNodeSerializer(read_only=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
fields = ('id', 'name', 'title', 'enabled', 'document_types', 'node_templates', 'instance_root')
|
fields = ('id', 'name', 'title', 'enabled', 'document_types', 'node_templates', 'instance_root')
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
"""Configuration options for the document_indexing app"""
|
"""Configuration options for the document_indexing app"""
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
|
||||||
|
|
||||||
from smart_settings.api import register_settings
|
from smart_settings.api import register_settings
|
||||||
|
|
||||||
available_indexing_functions = {
|
available_indexing_functions = {
|
||||||
|
|||||||
@@ -1,29 +1,18 @@
|
|||||||
from __future__ import absolute_import
|
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.files.base import File
|
||||||
from django.core.urlresolvers import reverse
|
|
||||||
from django.test.client import Client
|
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from rest_framework import status
|
|
||||||
from rest_framework.test import APIClient
|
|
||||||
|
|
||||||
from documents.models import Document, DocumentType
|
from documents.models import Document, DocumentType
|
||||||
from documents.tests import (TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_DESCRIPTION,
|
from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
|
||||||
TEST_DOCUMENT_TYPE)
|
from metadata.models import MetadataType, DocumentTypeMetadataType
|
||||||
from metadata.models import (MetadataType, DocumentMetadata,
|
|
||||||
DocumentTypeMetadataType)
|
|
||||||
from .models import Index, IndexInstanceNode, IndexTemplateNode
|
from .models import Index, IndexInstanceNode, IndexTemplateNode
|
||||||
|
|
||||||
|
|
||||||
class IndexTestCase(TestCase):
|
class IndexTestCase(TestCase):
|
||||||
def setUp(self):
|
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:
|
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
|
self.document = Document.objects.new_document(file_object=File(file_object), document_type=self.document_type)[0].document
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ from .permissions import (PERMISSION_DOCUMENT_PROPERTIES_EDIT,
|
|||||||
PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_TYPE_EDIT,
|
PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_TYPE_EDIT,
|
||||||
PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_CREATE,
|
PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_CREATE,
|
||||||
PERMISSION_DOCUMENT_TYPE_VIEW)
|
PERMISSION_DOCUMENT_TYPE_VIEW)
|
||||||
from .runtime import storage_backend
|
|
||||||
from .settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP,
|
from .settings import (PREVIEW_SIZE, RECENT_COUNT, ROTATION_STEP,
|
||||||
ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
|
ZOOM_PERCENT_STEP, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL)
|
||||||
from .tasks import (task_clear_image_cache, task_get_document_image,
|
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.add_as_recent_document_for_user(request.user)
|
||||||
|
|
||||||
|
|
||||||
document_fields = [
|
document_fields = [
|
||||||
{'label': _(u'Date added'), 'field': lambda x: x.date_added.date()},
|
{'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]},
|
{'label': _(u'Time added'), 'field': lambda x: unicode(x.date_added.time()).split('.')[0]},
|
||||||
|
|||||||
@@ -45,7 +45,6 @@ class DocumentPagesCarouselWidget(forms.widgets.Widget):
|
|||||||
|
|
||||||
# Reuse expensive values
|
# Reuse expensive values
|
||||||
latest_version_pk = value.latest_version.pk
|
latest_version_pk = value.latest_version.pk
|
||||||
page_count = value.page_count
|
|
||||||
|
|
||||||
for page in document_pages:
|
for page in document_pages:
|
||||||
output.append(u'<div style="margin: 5px 10px 10px 10px;">')
|
output.append(u'<div style="margin: 5px 10px 10px 10px;">')
|
||||||
|
|||||||
@@ -9,11 +9,7 @@ from django.core.urlresolvers import reverse
|
|||||||
from django.test.client import Client
|
from django.test.client import Client
|
||||||
from django.test import TestCase
|
from django.test import TestCase
|
||||||
|
|
||||||
from rest_framework import status
|
|
||||||
from rest_framework.test import APIClient
|
|
||||||
|
|
||||||
from documents.models import Document, DocumentType
|
from documents.models import Document, DocumentType
|
||||||
from ocr.parsers import parse_document_page
|
|
||||||
|
|
||||||
from .classes import SearchModel
|
from .classes import SearchModel
|
||||||
|
|
||||||
|
|||||||
@@ -3,19 +3,14 @@ from __future__ import absolute_import
|
|||||||
import logging
|
import logging
|
||||||
import urlparse
|
import urlparse
|
||||||
|
|
||||||
from django.core.exceptions import PermissionDenied
|
|
||||||
from django.core.urlresolvers import reverse
|
from django.core.urlresolvers import reverse
|
||||||
from django.http import HttpResponseRedirect
|
from django.http import HttpResponseRedirect
|
||||||
from django.shortcuts import render_to_response
|
from django.shortcuts import render_to_response
|
||||||
from django.template import RequestContext
|
from django.template import RequestContext
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from acls.models import AccessEntry
|
|
||||||
from permissions.models import Permission
|
|
||||||
|
|
||||||
from .classes import SearchModel
|
from .classes import SearchModel
|
||||||
from .forms import SearchForm, AdvancedSearchForm
|
from .forms import SearchForm, AdvancedSearchForm
|
||||||
from .models import RecentSearch
|
|
||||||
from .settings import LIMIT, SHOW_OBJECT_TYPE
|
from .settings import LIMIT, SHOW_OBJECT_TYPE
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = logging.getLogger(__name__)
|
||||||
|
|||||||
@@ -1,8 +1,3 @@
|
|||||||
import os
|
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
|
|
||||||
|
|
||||||
FORM_SUBMIT_URL = 'https://docs.google.com/spreadsheet/formResponse'
|
FORM_SUBMIT_URL = 'https://docs.google.com/spreadsheet/formResponse'
|
||||||
FORM_KEY = 'dGZrYkw3SDl5OENMTG15emp1UFFEUWc6MQ'
|
FORM_KEY = 'dGZrYkw3SDl5OENMTG15emp1UFFEUWc6MQ'
|
||||||
FORM_RECEIVER_FIELD = 'entry.0.single'
|
FORM_RECEIVER_FIELD = 'entry.0.single'
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from .exceptions import LockError
|
from .exceptions import LockError # NOQA
|
||||||
from .models import Lock as LockModel
|
from .models import Lock as LockModel
|
||||||
|
|
||||||
Lock = LockModel.objects
|
Lock = LockModel.objects
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
|
||||||
from .models import DocumentTypeMetadataType, MetadataType
|
from .models import MetadataType
|
||||||
from .tasks import task_add_required_metadata_type, task_remove_metadata_type
|
|
||||||
|
|
||||||
|
|
||||||
class DocumentMetadataHelper(object):
|
class DocumentMetadataHelper(object):
|
||||||
|
|||||||
@@ -85,4 +85,5 @@ MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0)
|
|||||||
|
|
||||||
class MetadataTypeForm(forms.ModelForm):
|
class MetadataTypeForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
fields = ('name', 'title', 'default', 'lookup')
|
||||||
model = MetadataType
|
model = MetadataType
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
from __future__ import absolute_import
|
from __future__ import absolute_import
|
||||||
|
|
||||||
from django.conf import settings
|
|
||||||
from django.core.files.base import File
|
from django.core.files.base import File
|
||||||
from django.test import TransactionTestCase
|
from django.test import TransactionTestCase
|
||||||
|
|
||||||
from documents.models import Document, DocumentType
|
from documents.models import Document, DocumentType
|
||||||
from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
|
from documents.tests import TEST_SMALL_DOCUMENT_PATH, TEST_DOCUMENT_TYPE
|
||||||
|
|
||||||
from .api import do_document_ocr
|
|
||||||
from .models import DocumentQueue, QueueDocument
|
from .models import DocumentQueue, QueueDocument
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -9,9 +9,11 @@ from .models import Role
|
|||||||
|
|
||||||
class RoleForm(forms.ModelForm):
|
class RoleForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
fields = ('name', 'label')
|
||||||
model = Role
|
model = Role
|
||||||
|
|
||||||
|
|
||||||
class RoleForm_view(DetailForm):
|
class RoleForm_view(DetailForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
|
fields = ('name', 'label')
|
||||||
model = Role
|
model = Role
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ from __future__ import absolute_import
|
|||||||
|
|
||||||
from django.contrib.auth.models import Group, User
|
from django.contrib.auth.models import Group, User
|
||||||
|
|
||||||
from rest_framework import generics, views
|
from rest_framework import generics
|
||||||
from rest_framework.response import Response
|
|
||||||
|
|
||||||
from rest_api.filters import MayanObjectPermissionsFilter
|
from rest_api.filters import MayanObjectPermissionsFilter
|
||||||
from rest_api.permissions import MayanPermission
|
from rest_api.permissions import MayanPermission
|
||||||
|
|||||||
Reference in New Issue
Block a user