PEP8 cleanups

This commit is contained in:
Roberto Rosario
2015-06-23 02:23:23 -04:00
parent c249b47b79
commit e4623fadcd
40 changed files with 34 additions and 145 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -1,6 +1,5 @@
from __future__ import unicode_literals
import warnings
import os
from django import forms

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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 _

View File

@@ -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

View File

@@ -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 _

View File

@@ -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',)

View File

@@ -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 (

View File

@@ -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')

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

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

View File

@@ -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

View File

@@ -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 _

View File

@@ -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 = []

View File

@@ -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 _

View File

@@ -1,7 +1,5 @@
from __future__ import unicode_literals
import os
import magic

View File

@@ -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

View File

@@ -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

View File

@@ -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 (

View File

@@ -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

View File

@@ -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)

View File

@@ -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
)

View File

@@ -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

View File

@@ -4,6 +4,7 @@ import yaml
from django.conf import settings
class Namespace(object):
_registry = {}

View File

@@ -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

View File

@@ -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

View File

@@ -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):

View File

@@ -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])

View File

@@ -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

View File

@@ -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)

View File

@@ -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

View File

@@ -23,7 +23,6 @@ class UserManagementApp(MayanAppConfig):
name = 'user_management'
verbose_name = _('User management')
def ready(self):
super(UserManagementApp, self).ready()