From e4623fadcd463ce4740f5d7807177080782b0dd1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Tue, 23 Jun 2015 02:23:23 -0400 Subject: [PATCH] PEP8 cleanups --- mayan/apps/authentication/apps.py | 6 ------ mayan/apps/authentication/forms.py | 5 ----- mayan/apps/authentication/views.py | 15 +-------------- mayan/apps/checkouts/managers.py | 3 --- mayan/apps/checkouts/models.py | 2 -- mayan/apps/common/forms.py | 1 - mayan/apps/converter/classes.py | 3 +-- mayan/apps/converter/literals.py | 2 -- mayan/apps/converter/managers.py | 5 +---- mayan/apps/converter/models.py | 1 - mayan/apps/converter/views.py | 5 ++--- mayan/apps/document_indexing/apps.py | 1 - mayan/apps/document_states/forms.py | 10 +--------- mayan/apps/document_states/views.py | 11 +++++------ mayan/apps/documents/apps.py | 3 --- mayan/apps/documents/forms.py | 6 +----- mayan/apps/documents/links.py | 14 ++++++-------- mayan/apps/documents/models.py | 7 +------ mayan/apps/documents/views.py | 13 ++++++------- mayan/apps/documents/widgets.py | 4 +--- mayan/apps/metadata/apps.py | 1 - mayan/apps/metadata/parsers.py | 2 -- mayan/apps/metadata/settings.py | 2 -- mayan/apps/mimetype/api.py | 2 -- mayan/apps/navigation/classes.py | 1 + .../navigation/templatetags/navigation_tags.py | 2 -- mayan/apps/ocr/api.py | 6 ------ mayan/apps/ocr/apps.py | 1 - mayan/apps/ocr/backends/tesseract.py | 14 ++------------ mayan/apps/ocr/classes.py | 8 -------- mayan/apps/ocr/parsers/__init__.py | 2 -- mayan/apps/smart_settings/classes.py | 1 + mayan/apps/smart_settings/views.py | 5 ----- mayan/apps/sources/api_views.py | 3 --- mayan/apps/sources/classes.py | 1 - mayan/apps/sources/links.py | 2 -- mayan/apps/sources/models.py | 1 - mayan/apps/sources/tasks.py | 5 +++-- mayan/apps/sources/views.py | 2 +- mayan/apps/user_management/apps.py | 1 - 40 files changed, 34 insertions(+), 145 deletions(-) diff --git a/mayan/apps/authentication/apps.py b/mayan/apps/authentication/apps.py index 1af08c8a11..7280dc6839 100644 --- a/mayan/apps/authentication/apps.py +++ b/mayan/apps/authentication/apps.py @@ -1,13 +1,7 @@ from __future__ import absolute_import, unicode_literals import logging -import tempfile -from django.conf import settings -from django.contrib.auth import models as auth_models -from django.contrib.auth.models import User -from django.contrib.auth.signals import user_logged_in -from django.db.models.signals import post_migrate, post_save from django.utils.translation import ugettext_lazy as _ from common import MayanAppConfig, menu_secondary diff --git a/mayan/apps/authentication/forms.py b/mayan/apps/authentication/forms.py index 975629f5f8..3509fecc88 100644 --- a/mayan/apps/authentication/forms.py +++ b/mayan/apps/authentication/forms.py @@ -1,14 +1,9 @@ from __future__ import unicode_literals import warnings -import os from django import forms -from django.conf import settings from django.contrib.auth import authenticate -from django.contrib.auth.models import User -from django.db import models -from django.utils.html import escape from django.utils.translation import ugettext_lazy as _ from common.widgets import EmailInput diff --git a/mayan/apps/authentication/views.py b/mayan/apps/authentication/views.py index ecf0b20254..6a5ca0ffd4 100644 --- a/mayan/apps/authentication/views.py +++ b/mayan/apps/authentication/views.py @@ -1,25 +1,12 @@ from __future__ import absolute_import, unicode_literals -from json import dumps, loads - from django.conf import settings from django.contrib import messages -from django.contrib.auth.models import User from django.contrib.auth.views import login, password_change -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect -from django.shortcuts import redirect, render_to_response -from django.template import RequestContext -from django.utils.http import urlencode +from django.shortcuts import redirect from django.utils.translation import ugettext_lazy as _ -from django.views.generic import FormView, TemplateView -from django.views.generic.edit import CreateView, DeleteView, UpdateView -from django.views.generic.list import ListView - -from dynamic_search.classes import SearchModel -from permissions.models import Permission from .forms import EmailAuthenticationForm from .settings import setting_login_method diff --git a/mayan/apps/checkouts/managers.py b/mayan/apps/checkouts/managers.py index 422efb0862..ca3211a2a9 100644 --- a/mayan/apps/checkouts/managers.py +++ b/mayan/apps/checkouts/managers.py @@ -2,13 +2,10 @@ from __future__ import absolute_import, unicode_literals import logging -from django.core.exceptions import PermissionDenied from django.db import models from django.utils.timezone import now -from acls.models import AccessEntry from documents.models import Document -from permissions.models import Permission from .events import ( event_document_auto_check_in, event_document_check_in, diff --git a/mayan/apps/checkouts/models.py b/mayan/apps/checkouts/models.py index 3f09fba26d..a3e0ce0442 100644 --- a/mayan/apps/checkouts/models.py +++ b/mayan/apps/checkouts/models.py @@ -3,8 +3,6 @@ from __future__ import unicode_literals import logging from django.conf import settings -from django.contrib.contenttypes import generic -from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/mayan/apps/common/forms.py b/mayan/apps/common/forms.py index e168b6bdf3..23adb1e63c 100644 --- a/mayan/apps/common/forms.py +++ b/mayan/apps/common/forms.py @@ -1,6 +1,5 @@ from __future__ import unicode_literals -import warnings import os from django import forms diff --git a/mayan/apps/converter/classes.py b/mayan/apps/converter/classes.py index 6154a58d42..67670798fa 100644 --- a/mayan/apps/converter/classes.py +++ b/mayan/apps/converter/classes.py @@ -1,7 +1,6 @@ from __future__ import unicode_literals import logging -import io import os import subprocess import tempfile @@ -19,7 +18,7 @@ from common.settings import setting_temporary_directory from common.utils import fs_cleanup from mimetype.api import get_mimetype -from .exceptions import OfficeConversionError, UnknownFileFormat +from .exceptions import OfficeConversionError from .literals import DEFAULT_PAGE_NUMBER, DEFAULT_FILE_FORMAT from .settings import setting_libreoffice_path diff --git a/mayan/apps/converter/literals.py b/mayan/apps/converter/literals.py index 69c9c2b3d6..2377661029 100644 --- a/mayan/apps/converter/literals.py +++ b/mayan/apps/converter/literals.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -from django.utils.translation import ugettext_lazy as _ - DEFAULT_ZOOM_LEVEL = 100 DEFAULT_ROTATION = 0 DEFAULT_PAGE_NUMBER = 1 diff --git a/mayan/apps/converter/managers.py b/mayan/apps/converter/managers.py index 096cea7c97..ef03cc4eae 100644 --- a/mayan/apps/converter/managers.py +++ b/mayan/apps/converter/managers.py @@ -23,7 +23,7 @@ class TransformationManager(models.Manager): logger.debug('source transformations: %s', transformations) # Get all targets from target QS - targets_dict = map(lambda entry:{'content_type': entry[0], 'object_id': entry[1]}, zip(ContentType.objects.get_for_models(*targets).values(), targets.values_list('pk', flat=True))) + targets_dict = map(lambda entry: {'content_type': entry[0], 'object_id': entry[1]}, zip(ContentType.objects.get_for_models(*targets).values(), targets.values_list('pk', flat=True))) logger.debug('targets: %s', targets_dict) # Combine the two @@ -66,6 +66,3 @@ class TransformationManager(models.Manager): return result else: return transformations - - - diff --git a/mayan/apps/converter/models.py b/mayan/apps/converter/models.py index 17bff6b53b..53f0a6403e 100644 --- a/mayan/apps/converter/models.py +++ b/mayan/apps/converter/models.py @@ -6,7 +6,6 @@ import logging from django.contrib.contenttypes import generic from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ValidationError -from django.core.urlresolvers import reverse from django.db import models from django.utils.encoding import python_2_unicode_compatible from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py index 0c5f3f3b02..e53483291f 100644 --- a/mayan/apps/converter/views.py +++ b/mayan/apps/converter/views.py @@ -2,17 +2,16 @@ from __future__ import absolute_import, unicode_literals import logging -from django.conf import settings from django.contrib import messages from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ObjectDoesNotExist, PermissionDenied +from django.core.exceptions import PermissionDenied from django.core.urlresolvers import reverse from django.http import Http404, HttpResponseRedirect from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext -from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _ +from acls.models import AccessEntry from common.utils import encapsulate from permissions.models import Permission diff --git a/mayan/apps/document_indexing/apps.py b/mayan/apps/document_indexing/apps.py index a4e795e70d..59a67ea0c4 100644 --- a/mayan/apps/document_indexing/apps.py +++ b/mayan/apps/document_indexing/apps.py @@ -1,6 +1,5 @@ from __future__ import absolute_import, unicode_literals -from django import apps from django.db.models.signals import post_save, post_delete from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/document_states/forms.py b/mayan/apps/document_states/forms.py index 3be2a5e2da..451693e3a3 100644 --- a/mayan/apps/document_states/forms.py +++ b/mayan/apps/document_states/forms.py @@ -3,9 +3,7 @@ from __future__ import unicode_literals from django import forms from django.utils.translation import ugettext_lazy as _ -from common.forms import DetailForm - -from .models import Workflow, WorkflowState, WorkflowInstance, WorkflowTransition +from .models import Workflow, WorkflowState, WorkflowTransition class WorkflowForm(forms.ModelForm): @@ -40,9 +38,3 @@ class WorkflowInstanceTransitionForm(forms.Form): transition = forms.ChoiceField(label=_('Transition')) comment = forms.CharField(label=_('Comment'), required=False, widget=forms.widgets.Textarea()) - - -class WorkflowInstanceDetailForm(DetailForm): - class Meta: - model = WorkflowInstance - fields = ('workflow',) diff --git a/mayan/apps/document_states/views.py b/mayan/apps/document_states/views.py index 92cefc281b..cc59234e95 100644 --- a/mayan/apps/document_states/views.py +++ b/mayan/apps/document_states/views.py @@ -7,21 +7,20 @@ from django.db.utils import IntegrityError from django.http import HttpResponseRedirect from django.shortcuts import get_object_or_404 from django.utils.translation import ugettext_lazy as _ -from django.views.generic import FormView, View +from django.views.generic import FormView from acls.models import AccessEntry from common.utils import generate_choices_w_labels from common.views import ( - AssignRemoveView, ConfirmView, SingleObjectCreateView, - SingleObjectDeleteView, SingleObjectEditView, SingleObjectListView + AssignRemoveView, SingleObjectCreateView, SingleObjectDeleteView, + SingleObjectEditView, SingleObjectListView ) from documents.models import Document from permissions.models import Permission from .forms import ( - WorkflowForm, - WorkflowInstanceDetailForm, WorkflowInstanceTransitionForm, - WorkflowStateForm, WorkflowTransitionForm + WorkflowForm, WorkflowInstanceTransitionForm, WorkflowStateForm, + WorkflowTransitionForm ) from .models import Workflow, WorkflowInstance, WorkflowState, WorkflowTransition from .permissions import ( diff --git a/mayan/apps/documents/apps.py b/mayan/apps/documents/apps.py index ffba982bf3..cdf44ed846 100644 --- a/mayan/apps/documents/apps.py +++ b/mayan/apps/documents/apps.py @@ -28,7 +28,6 @@ from navigation.api import register_model_list_columns from rest_api.classes import APIEndPoint from statistics.classes import StatisticNamespace -from documents import settings as document_settings from .handlers import create_default_document_type from .links import ( link_clear_image_cache, link_document_acl_list, @@ -82,8 +81,6 @@ class DocumentsApp(MayanAppConfig): APIEndPoint('documents') - DocumentPage.add_to_class('get_transformation_list', lambda document_page: Transformation.objects.get_for_object(document_page)) - MissingItem(label=_('Create a document type'), description=_('Every uploaded document must be assigned a document type, it is the basic way Mayan EDMS categorizes documents.'), condition=lambda: not DocumentType.objects.exists(), view='documents:document_type_list') ModelAttribute(Document, label=_('Label'), name='label', type_name='field') diff --git a/mayan/apps/documents/forms.py b/mayan/apps/documents/forms.py index 91d677f6bc..9158c5b2f3 100644 --- a/mayan/apps/documents/forms.py +++ b/mayan/apps/documents/forms.py @@ -1,13 +1,9 @@ from __future__ import unicode_literals from django import forms -from django.utils.encoding import force_unicode -from django.utils.html import conditional_escape -from django.utils.safestring import mark_safe -from django.utils.translation import ugettext_lazy as _, ugettext +from django.utils.translation import ugettext_lazy as _ from common.forms import DetailForm -from common.widgets import TextAreaDiv from .models import ( Document, DocumentType, DocumentPage, DocumentTypeFilename diff --git a/mayan/apps/documents/links.py b/mayan/apps/documents/links.py index de1a529cb1..777ddfe8b5 100644 --- a/mayan/apps/documents/links.py +++ b/mayan/apps/documents/links.py @@ -3,19 +3,17 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ from acls.permissions import ACLS_VIEW_ACL -from converter.permissions import ( - PERMISSION_TRANSFORMATION_DELETE, PERMISSION_TRANSFORMATION_VIEW -) +from converter.permissions import PERMISSION_TRANSFORMATION_DELETE from events.permissions import PERMISSION_EVENTS_VIEW from navigation import Link from .permissions import ( PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, - PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_PROPERTIES_EDIT, - PERMISSION_DOCUMENT_PRINT, PERMISSION_DOCUMENT_TOOLS, - PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_VIEW, - PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_DELETE, - PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_VIEW + PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_PRINT, + PERMISSION_DOCUMENT_TOOLS, PERMISSION_DOCUMENT_VERSION_REVERT, + PERMISSION_DOCUMENT_VIEW, PERMISSION_DOCUMENT_TYPE_CREATE, + PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_EDIT, + PERMISSION_DOCUMENT_TYPE_VIEW ) from .settings import setting_zoom_max_level, setting_zoom_min_level diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py index 4246e3e284..bca0fb45bc 100644 --- a/mayan/apps/documents/models.py +++ b/mayan/apps/documents/models.py @@ -1,15 +1,12 @@ from __future__ import unicode_literals -from ast import literal_eval import base64 import hashlib import logging import os -import tempfile import uuid from django.contrib.auth.models import User -from django.core.exceptions import ValidationError from django.core.urlresolvers import reverse from django.db import models, transaction from django.utils.encoding import python_2_unicode_compatible @@ -22,9 +19,7 @@ from converter import ( converter_class, TransformationResize, TransformationRotate, TransformationZoom ) from converter.exceptions import UnknownFileFormat -from converter.literals import ( - DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION, DEFAULT_PAGE_NUMBER -) +from converter.literals import DEFAULT_ZOOM_LEVEL, DEFAULT_ROTATION from converter.models import Transformation from mimetype.api import get_mimetype diff --git a/mayan/apps/documents/views.py b/mayan/apps/documents/views.py index 9b7998d439..cab994a4f2 100644 --- a/mayan/apps/documents/views.py +++ b/mayan/apps/documents/views.py @@ -11,13 +11,12 @@ from django.core.urlresolvers import resolve, reverse from django.http import HttpResponse, HttpResponseRedirect from django.shortcuts import render_to_response, get_object_or_404 from django.template import RequestContext -from django.utils.http import urlencode from django.utils.translation import ugettext_lazy as _, ungettext from acls.models import AccessEntry from acls.views import acl_list_for from common.compressed_files import CompressedFile -from common.utils import encapsulate, pretty_size, urlquote +from common.utils import encapsulate, pretty_size from common.views import ParentChildListView, SingleObjectListView from common.widgets import two_state_template from converter.literals import ( @@ -44,11 +43,11 @@ from .models import ( ) from .permissions import ( PERMISSION_DOCUMENT_DELETE, PERMISSION_DOCUMENT_DOWNLOAD, - PERMISSION_DOCUMENT_EDIT, PERMISSION_DOCUMENT_PRINT, - PERMISSION_DOCUMENT_PROPERTIES_EDIT, PERMISSION_DOCUMENT_TOOLS, - PERMISSION_DOCUMENT_TYPE_CREATE, PERMISSION_DOCUMENT_TYPE_DELETE, - PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_TYPE_VIEW, - PERMISSION_DOCUMENT_VERSION_REVERT, PERMISSION_DOCUMENT_VIEW, + PERMISSION_DOCUMENT_PRINT, PERMISSION_DOCUMENT_PROPERTIES_EDIT, + PERMISSION_DOCUMENT_TOOLS, PERMISSION_DOCUMENT_TYPE_CREATE, + PERMISSION_DOCUMENT_TYPE_DELETE, PERMISSION_DOCUMENT_TYPE_EDIT, + PERMISSION_DOCUMENT_TYPE_VIEW, PERMISSION_DOCUMENT_VERSION_REVERT, + PERMISSION_DOCUMENT_VIEW, ) from .settings import ( setting_preview_size, setting_recent_count, setting_rotation_step, diff --git a/mayan/apps/documents/widgets.py b/mayan/apps/documents/widgets.py index b022a773ca..86c85fc5f4 100644 --- a/mayan/apps/documents/widgets.py +++ b/mayan/apps/documents/widgets.py @@ -9,9 +9,7 @@ from django.utils.safestring import mark_safe from django.utils.translation import ugettext from django.utils.translation import ugettext_lazy as _ -from converter.literals import ( - DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL -) +from converter.literals import DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL from .settings import setting_display_size, setting_thumbnail_size diff --git a/mayan/apps/metadata/apps.py b/mayan/apps/metadata/apps.py index cb550c827c..d9c6384691 100644 --- a/mayan/apps/metadata/apps.py +++ b/mayan/apps/metadata/apps.py @@ -2,7 +2,6 @@ from __future__ import unicode_literals import logging -from django import apps from django.db.models.signals import post_delete, post_save from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/metadata/parsers.py b/mayan/apps/metadata/parsers.py index 6f5672ca4e..4a0fd2383e 100644 --- a/mayan/apps/metadata/parsers.py +++ b/mayan/apps/metadata/parsers.py @@ -2,8 +2,6 @@ from __future__ import unicode_literals from dateutil.parser import parse -from django.utils.translation import ugettext_lazy as _ - class MetadataParser(object): _registry = [] diff --git a/mayan/apps/metadata/settings.py b/mayan/apps/metadata/settings.py index b2a64abbc2..8273ce21ce 100644 --- a/mayan/apps/metadata/settings.py +++ b/mayan/apps/metadata/settings.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import yaml - from django.contrib.auth.models import User from django.utils.timezone import now from django.utils.translation import ugettext_lazy as _ diff --git a/mayan/apps/mimetype/api.py b/mayan/apps/mimetype/api.py index 5a50005662..f0d0001d91 100644 --- a/mayan/apps/mimetype/api.py +++ b/mayan/apps/mimetype/api.py @@ -1,7 +1,5 @@ from __future__ import unicode_literals -import os - import magic diff --git a/mayan/apps/navigation/classes.py b/mayan/apps/navigation/classes.py index d0f6a502e5..12ed5103bf 100644 --- a/mayan/apps/navigation/classes.py +++ b/mayan/apps/navigation/classes.py @@ -5,6 +5,7 @@ import logging import urllib import urlparse +from django.conf import settings from django.core.exceptions import PermissionDenied from django.core.urlresolvers import resolve, reverse from django.template import VariableDoesNotExist, Variable diff --git a/mayan/apps/navigation/templatetags/navigation_tags.py b/mayan/apps/navigation/templatetags/navigation_tags.py index 391fe399bb..305c3d97c8 100644 --- a/mayan/apps/navigation/templatetags/navigation_tags.py +++ b/mayan/apps/navigation/templatetags/navigation_tags.py @@ -2,8 +2,6 @@ from __future__ import unicode_literals from django.template import Library -from common.utils import urlquote - from ..classes import Menu from ..forms import MultiItemForm diff --git a/mayan/apps/ocr/api.py b/mayan/apps/ocr/api.py index 9a1339f938..6cf9105815 100644 --- a/mayan/apps/ocr/api.py +++ b/mayan/apps/ocr/api.py @@ -6,13 +6,7 @@ import tempfile import sh -from django.utils.module_loading import import_string -from django.utils.translation import ugettext_lazy as _ - from common.settings import setting_temporary_directory -from common.utils import fs_cleanup -from converter import converter_class -from documents.models import DocumentPage from .exceptions import UnpaperError from .literals import ( diff --git a/mayan/apps/ocr/apps.py b/mayan/apps/ocr/apps.py index f4a5a0a15d..3990fbaad3 100644 --- a/mayan/apps/ocr/apps.py +++ b/mayan/apps/ocr/apps.py @@ -11,7 +11,6 @@ from common import ( MayanAppConfig, menu_facet, menu_multi_item, menu_object, menu_secondary, menu_tools ) -from common.api import register_maintenance_links from common.utils import encapsulate from documents.models import Document, DocumentVersion from documents.signals import post_version_upload diff --git a/mayan/apps/ocr/backends/tesseract.py b/mayan/apps/ocr/backends/tesseract.py index 5e90148822..443960bcbf 100644 --- a/mayan/apps/ocr/backends/tesseract.py +++ b/mayan/apps/ocr/backends/tesseract.py @@ -1,21 +1,10 @@ from __future__ import unicode_literals -try: - from cStringIO import StringIO -except ImportError: - from StringIO import StringIO - -import codecs -import errno import logging -import os -import tempfile -from PIL import Image, ImageFilter +from PIL import Image import pytesseract -from common.utils import fs_cleanup - from ..classes import OCRBackendBase from ..exceptions import OCRError from ..settings import setting_tesseract_path @@ -30,6 +19,7 @@ class Tesseract(OCRBackendBase): """ super(Tesseract, self).execute(*args, **kwargs) + # TODO: pass tesseract binary path to the pytesseract image = Image.open(self.converter.get_page()) try: result = pytesseract.image_to_string(image=image, lang=self.language) diff --git a/mayan/apps/ocr/classes.py b/mayan/apps/ocr/classes.py index 67753b33c6..ea877ef606 100644 --- a/mayan/apps/ocr/classes.py +++ b/mayan/apps/ocr/classes.py @@ -1,17 +1,9 @@ from __future__ import unicode_literals import logging -import os -import tempfile -from django.utils.module_loading import import_string -from django.utils.translation import ugettext_lazy as _ - -from common.utils import fs_cleanup from converter import converter_class -from documents.models import DocumentPage -from .exceptions import UnpaperError from .literals import ( DEFAULT_OCR_FILE_EXTENSION, DEFAULT_OCR_FILE_FORMAT, UNPAPER_FILE_FORMAT ) diff --git a/mayan/apps/ocr/parsers/__init__.py b/mayan/apps/ocr/parsers/__init__.py index 149049da62..508b1eee99 100644 --- a/mayan/apps/ocr/parsers/__init__.py +++ b/mayan/apps/ocr/parsers/__init__.py @@ -6,8 +6,6 @@ import slate import subprocess import tempfile -from django.utils.translation import ugettext_lazy as _ - from common.settings import setting_temporary_directory from common.utils import copyfile from converter.exceptions import OfficeConversionError diff --git a/mayan/apps/smart_settings/classes.py b/mayan/apps/smart_settings/classes.py index 85a7596168..b41691b185 100644 --- a/mayan/apps/smart_settings/classes.py +++ b/mayan/apps/smart_settings/classes.py @@ -4,6 +4,7 @@ import yaml from django.conf import settings + class Namespace(object): _registry = {} diff --git a/mayan/apps/smart_settings/views.py b/mayan/apps/smart_settings/views.py index 15536cfd77..13e03d1b32 100644 --- a/mayan/apps/smart_settings/views.py +++ b/mayan/apps/smart_settings/views.py @@ -1,12 +1,7 @@ from __future__ import unicode_literals -from django.shortcuts import render_to_response -from django.template import RequestContext from django.utils.translation import ugettext_lazy as _ -from django.utils.safestring import mark_safe -from common.utils import encapsulate -from common.widgets import exists_widget from common.views import SimpleView from .classes import Namespace diff --git a/mayan/apps/sources/api_views.py b/mayan/apps/sources/api_views.py index ab0f929ab9..cda64b4a69 100644 --- a/mayan/apps/sources/api_views.py +++ b/mayan/apps/sources/api_views.py @@ -3,9 +3,6 @@ from __future__ import unicode_literals from django.shortcuts import get_object_or_404 from converter.exceptions import UnkownConvertError, UnknownFileFormat -from converter.literals import ( - DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL -) from converter.models import Transformation from rest_framework import generics from rest_framework.response import Response diff --git a/mayan/apps/sources/classes.py b/mayan/apps/sources/classes.py index 6d1d41717d..7448ae4a4e 100644 --- a/mayan/apps/sources/classes.py +++ b/mayan/apps/sources/classes.py @@ -12,7 +12,6 @@ except ImportError: from django.core.files import File from converter import TransformationResize, converter_class -from mimetype.api import get_mimetype class PseudoFile(File): diff --git a/mayan/apps/sources/links.py b/mayan/apps/sources/links.py index ad8ec0be47..243ca8a127 100644 --- a/mayan/apps/sources/links.py +++ b/mayan/apps/sources/links.py @@ -2,7 +2,6 @@ from __future__ import absolute_import, unicode_literals from django.utils.translation import ugettext_lazy as _ -from converter.permissions import PERMISSION_TRANSFORMATION_VIEW from documents.permissions import ( PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_NEW_VERSION ) @@ -32,4 +31,3 @@ link_source_list = Link(permissions=[PERMISSION_SOURCES_SETUP_VIEW], text=_('Doc link_staging_file_delete = Link(keep_query=True, permissions=[PERMISSION_DOCUMENT_NEW_VERSION, PERMISSION_DOCUMENT_CREATE], tags='dangerous', text=_('Delete'), view='sources:staging_file_delete', args=['source.pk', 'object.encoded_filename']) link_upload_version = Link(permissions=[PERMISSION_DOCUMENT_NEW_VERSION], text=_('Upload new version'), view='sources:upload_version', args='object.pk') link_setup_source_logs = Link(text=_('Logs'), view='sources:setup_source_logs', args=['resolved_object.pk'], permissions=[PERMISSION_SOURCES_SETUP_VIEW]) - diff --git a/mayan/apps/sources/models.py b/mayan/apps/sources/models.py index ac15e051f7..a8ab33db9a 100644 --- a/mayan/apps/sources/models.py +++ b/mayan/apps/sources/models.py @@ -8,7 +8,6 @@ import logging import os import poplib -from django.core.exceptions import ValidationError from django.core.files import File from django.db import models from django.utils.encoding import python_2_unicode_compatible diff --git a/mayan/apps/sources/tasks.py b/mayan/apps/sources/tasks.py index 200533b6db..2d1747c66b 100644 --- a/mayan/apps/sources/tasks.py +++ b/mayan/apps/sources/tasks.py @@ -2,6 +2,7 @@ import logging from django.contrib.auth.models import User from django.core.files import File +from django.utils.translation import ugettext_lazy as _ from mayan.celery import app @@ -21,9 +22,9 @@ def task_check_interval_source(source_id): source.check_source() except Exception as exception: logger.error('Error processing source: %s; %s', source, exception) - self.logs.create(message=_('Error processing source: %s') % exception) + source.logs.create(message=_('Error processing source: %s') % exception) else: - self.logs.all().delete() + source.logs.all().delete() @app.task(ignore_result=True) diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index aad9d8d849..725f24f838 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -20,7 +20,7 @@ from documents.permissions import ( PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_NEW_VERSION ) from documents.tasks import task_upload_new_version -from metadata.api import decode_metadata_from_url, metadata_repr_as_list +from metadata.api import decode_metadata_from_url from navigation import Link from permissions.models import Permission diff --git a/mayan/apps/user_management/apps.py b/mayan/apps/user_management/apps.py index df18f12659..71a457122b 100644 --- a/mayan/apps/user_management/apps.py +++ b/mayan/apps/user_management/apps.py @@ -23,7 +23,6 @@ class UserManagementApp(MayanAppConfig): name = 'user_management' verbose_name = _('User management') - def ready(self): super(UserManagementApp, self).ready()