PEP8 cleanups

This commit is contained in:
Roberto Rosario
2011-05-25 00:00:23 -04:00
parent 2721512514
commit 53cb857a8f
15 changed files with 37 additions and 38 deletions

View File

@@ -1,7 +1,6 @@
from django import forms from django import forms
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext from django.utils.translation import ugettext
from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
from django.conf import settings from django.conf import settings
@@ -14,6 +13,7 @@ from common.conf.settings import DEFAULT_PAGE_ORIENTATION
from documents.models import Document, DocumentType, \ from documents.models import Document, DocumentType, \
DocumentPage, DocumentPageTransformation DocumentPage, DocumentPageTransformation
# Document page forms # Document page forms
class DocumentPageTransformationForm(forms.ModelForm): class DocumentPageTransformationForm(forms.ModelForm):
class Meta: class Meta:

View File

@@ -1,5 +1,4 @@
import os import os
from datetime import datetime
import tempfile import tempfile
from django.db import models from django.db import models

View File

@@ -17,8 +17,8 @@ from documents.conf.settings import STAGING_FILES_PREVIEW_SIZE
from documents.conf.settings import USER_STAGING_DIRECTORY_ROOT from documents.conf.settings import USER_STAGING_DIRECTORY_ROOT
from documents.conf.settings import USER_STAGING_DIRECTORY_EXPRESSION from documents.conf.settings import USER_STAGING_DIRECTORY_EXPRESSION
from documents.literals import UPLOAD_SOURCE_LOCAL, \ from documents.literals import UPLOAD_SOURCE_STAGING, \
UPLOAD_SOURCE_STAGING, UPLOAD_SOURCE_USER_STAGING UPLOAD_SOURCE_USER_STAGING
HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest() HASH_FUNCTION = lambda x: hashlib.sha256(x).hexdigest()
#TODO: Do benchmarks #TODO: Do benchmarks
@@ -30,6 +30,7 @@ STAGING_FILE_FUNCTIONS = {
UPLOAD_SOURCE_USER_STAGING: lambda x: os.path.join(USER_STAGING_DIRECTORY_ROOT, eval(USER_STAGING_DIRECTORY_EXPRESSION, {'user': x.user})) UPLOAD_SOURCE_USER_STAGING: lambda x: os.path.join(USER_STAGING_DIRECTORY_ROOT, eval(USER_STAGING_DIRECTORY_EXPRESSION, {'user': x.user}))
} }
def evaluate_user_staging_path(request, source): def evaluate_user_staging_path(request, source):
try: try:
return STAGING_FILE_FUNCTIONS[source](request) return STAGING_FILE_FUNCTIONS[source](request)
@@ -64,7 +65,7 @@ class StagingFile(object):
@classmethod @classmethod
def set_path(cls, path): def set_path(cls, path):
cls.path = path cls.path = path
@classmethod @classmethod
def get_all(cls): def get_all(cls):

View File

@@ -187,7 +187,7 @@ def upload_document_with_type(request, source):
if (not UNCOMPRESS_COMPRESSED_STAGING_FILES) or (UNCOMPRESS_COMPRESSED_STAGING_FILES and not _handle_zip_file(request, staging_file.upload(), document_type)): if (not UNCOMPRESS_COMPRESSED_STAGING_FILES) or (UNCOMPRESS_COMPRESSED_STAGING_FILES and not _handle_zip_file(request, staging_file.upload(), document_type)):
document = Document(file=staging_file.upload()) document = Document(file=staging_file.upload())
if document_type: if document_type:
document.document_type=document_type document.document_type = document_type
document.save() document.save()
_handle_save_document(request, document, form) _handle_save_document(request, document, form)
messages.success(request, _(u'Staging file: %s, uploaded successfully.') % staging_file.filename) messages.success(request, _(u'Staging file: %s, uploaded successfully.') % staging_file.filename)
@@ -207,7 +207,6 @@ def upload_document_with_type(request, source):
form = StagingDocumentForm(cls=StagingFile, form = StagingDocumentForm(cls=StagingFile,
initial={'document_type': document_type}) initial={'document_type': document_type})
subtemplates_list = [] subtemplates_list = []
if source == UPLOAD_SOURCE_LOCAL: if source == UPLOAD_SOURCE_LOCAL:

View File

@@ -1,8 +1,7 @@
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.contrib import messages from django.contrib import messages
from django.http import HttpResponseRedirect from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404 from django.shortcuts import get_object_or_404
from django.template import RequestContext
from documents.models import Document from documents.models import Document
from documents.views import document_list from documents.views import document_list

View File

@@ -81,4 +81,3 @@ class MetadataSelectionForm(forms.Form):
) )
MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0) MetadataRemoveFormSet = formset_factory(MetadataRemoveForm, extra=0)

View File

@@ -2,7 +2,12 @@ from django.db import models
from ocr.exceptions import AlreadyQueued from ocr.exceptions import AlreadyQueued
class DocumentQueueManager(models.Manager): class DocumentQueueManager(models.Manager):
"""
Module manager class to handle adding documents to an OCR document
queue
"""
def queue_document(self, document, queue_name='default'): def queue_document(self, document, queue_name='default'):
document_queue = self.model.objects.get(name=queue_name) document_queue = self.model.objects.get(name=queue_name)
if document_queue.queuedocument_set.filter(document=document): if document_queue.queuedocument_set.filter(document=document):

View File

@@ -8,12 +8,12 @@ from navigation.api import register_links
from permissions.conf.settings import DEFAULT_ROLES from permissions.conf.settings import DEFAULT_ROLES
from permissions.models import Role from permissions.models import Role
PERMISSION_ROLE_VIEW = {'namespace': 'permissions', 'name': 'role_view', 'label':_(u'View roles')} PERMISSION_ROLE_VIEW = {'namespace': 'permissions', 'name': 'role_view', 'label': _(u'View roles')}
PERMISSION_ROLE_EDIT = {'namespace': 'permissions', 'name': 'role_edit', 'label':_(u'Edit roles')} PERMISSION_ROLE_EDIT = {'namespace': 'permissions', 'name': 'role_edit', 'label': _(u'Edit roles')}
PERMISSION_ROLE_CREATE = {'namespace': 'permissions', 'name': 'role_create', 'label':_(u'Create roles')} PERMISSION_ROLE_CREATE = {'namespace': 'permissions', 'name': 'role_create', 'label': _(u'Create roles')}
PERMISSION_ROLE_DELETE = {'namespace': 'permissions', 'name': 'role_delete', 'label':_(u'Delete roles')} PERMISSION_ROLE_DELETE = {'namespace': 'permissions', 'name': 'role_delete', 'label': _(u'Delete roles')}
PERMISSION_PERMISSION_GRANT = {'namespace': 'permissions', 'name': 'permission_grant', 'label':_(u'Grant permissions')} PERMISSION_PERMISSION_GRANT = {'namespace': 'permissions', 'name': 'permission_grant', 'label': _(u'Grant permissions')}
PERMISSION_PERMISSION_REVOKE = {'namespace': 'permissions', 'name': 'permission_revoke', 'label':_(u'Revoke permissions')} PERMISSION_PERMISSION_REVOKE = {'namespace': 'permissions', 'name': 'permission_revoke', 'label': _(u'Revoke permissions')}
role_list = {'text': _(u'roles'), 'view': 'role_list', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_VIEW]} role_list = {'text': _(u'roles'), 'view': 'role_list', 'famfam': 'medal_gold_1', 'permissions': [PERMISSION_ROLE_VIEW]}

View File

@@ -1,6 +1,5 @@
from django.db.utils import DatabaseError from django.db.utils import DatabaseError
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext from django.utils.translation import ugettext
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
@@ -31,7 +30,6 @@ def check_permissions(requester, permission_list):
raise PermissionDenied(ugettext(u'Insufficient permissions.')) raise PermissionDenied(ugettext(u'Insufficient permissions.'))
register_permission(PERMISSION_ROLE_VIEW) register_permission(PERMISSION_ROLE_VIEW)
register_permission(PERMISSION_ROLE_EDIT) register_permission(PERMISSION_ROLE_EDIT)
register_permission(PERMISSION_ROLE_CREATE) register_permission(PERMISSION_ROLE_CREATE)

View File

@@ -1,5 +1,4 @@
from django import forms from django import forms
from django.utils.translation import ugettext_lazy as _
from common.forms import DetailForm from common.forms import DetailForm