PEP8 clean up and trivial typo fixes

This commit is contained in:
Roberto Rosario
2015-06-08 15:54:54 -04:00
parent d678431c97
commit 32fe03aaa7
5 changed files with 4 additions and 52 deletions

View File

@@ -15,14 +15,8 @@ from PIL import Image
import sh
from common.utils import fs_cleanup
from mimetype.api import get_mimetype
from ..classes import ConverterBase
from ..exceptions import ConvertError, UnknownFileFormat
from ..literals import (
DEFAULT_FILE_FORMAT, DEFAULT_PAGE_NUMBER, TRANSFORMATION_RESIZE,
TRANSFORMATION_ROTATE, TRANSFORMATION_ZOOM
)
from ..settings import PDFTOPPM_PATH
try:
@@ -92,6 +86,3 @@ class Python(ConverterBase):
pass
return page_count

View File

@@ -1,4 +1,3 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.utils.translation import ugettext_lazy as _
@@ -10,41 +9,3 @@ DEFAULT_FILE_FORMAT = 'jpeg'
DEFAULT_FILE_FORMAT_MIMETYPE = 'image/jpeg'
DIMENSION_SEPARATOR = 'x'
TRANSFORMATION_RESIZE = 'resize'
TRANSFORMATION_ROTATE = 'rotate'
TRANSFORMATION_DENSITY = 'density'
TRANSFORMATION_ZOOM = 'zoom'
TRANSFORMATION_CHOICES = {
TRANSFORMATION_RESIZE: {
'label': _('Resize'),
'description': _('Resize.'),
'arguments': [
{'name': 'width', 'label': _('Width'), 'required': True},
{'name': 'height', 'label': _('Height'), 'required': False},
]
},
TRANSFORMATION_ROTATE: {
'label': _('Rotate'),
'description': _('Rotate by n degress.'),
'arguments': [
{'name': 'degrees', 'label': _('Degrees'), 'required': True}
]
},
TRANSFORMATION_DENSITY: {
'label': _('Density'),
'description': _('Change the resolution (ie: DPI) without resizing.'),
'arguments': [
{'name': 'width', 'label': _('Width'), 'required': True},
{'name': 'height', 'label': _('Height'), 'required': False},
]
},
TRANSFORMATION_ZOOM: {
'label': _('Zoom'),
'description': _('Zoom by n percent.'),
'arguments': [
{'name': 'percent', 'label': _('Percent'), 'required': True}
]
},
}

View File

@@ -200,7 +200,7 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView):
try:
Permission.objects.check_permissions(self.request.user, [PERMISSION_WORKFLOW_EDIT])
except PermissionDenied:
AccessEntry.objects.check_access(PERMISSION_WORKFLOW_EDIT, self.request.user,self.workflow)
AccessEntry.objects.check_access(PERMISSION_WORKFLOW_EDIT, self.request.user, self.workflow)
return super(SetupWorkflowDocumentTypesView, self).dispatch(request, *args, **kwargs)

View File

@@ -33,7 +33,7 @@ from .links import (
link_setup_metadata_type_delete, link_setup_metadata_type_edit,
link_setup_metadata_type_list, link_documents_missing_required_metadata
)
from .models import DocumentMetadata, DocumentTypeMetadataType, MetadataType
from .models import DocumentTypeMetadataType, MetadataType
from .permissions import (
PERMISSION_METADATA_DOCUMENT_ADD, PERMISSION_METADATA_DOCUMENT_EDIT,
PERMISSION_METADATA_DOCUMENT_REMOVE, PERMISSION_METADATA_DOCUMENT_VIEW

View File

@@ -13,7 +13,7 @@ from django.utils.translation import ugettext_lazy as _, ungettext
from acls.models import AccessEntry
from documents.models import Document, DocumentType
from documents.permissions import (
PERMISSION_DOCUMENT_TYPE_EDIT, PERMISSION_DOCUMENT_VIEW
PERMISSION_DOCUMENT_TYPE_EDIT
)
from documents.views import DocumentListView
from permissions.models import Permission
@@ -163,7 +163,7 @@ def metadata_add(request, document_id=None, document_id_list=None):
if not documents:
messages.error(request, _('Must provide at least one document.'))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reversesettings.LOGIN_REDIRECT_URL))
return HttpResponseRedirect(request.META.get('HTTP_REFERER', reverse(settings.LOGIN_REDIRECT_URL)))
for document in documents:
document.add_as_recent_document_for_user(request.user)