PEP8 Cleanups

This commit is contained in:
Roberto Rosario
2012-01-01 20:26:16 -04:00
parent 722f70029b
commit 6864f14269
4 changed files with 37 additions and 41 deletions

View File

@@ -10,9 +10,8 @@ from django.utils.translation import ugettext_lazy as _
from django.db.models.signals import post_save
from documents.models import Document, DocumentVersion
from navigation.api import register_links, register_top_menu, \
register_model_list_columns, register_multi_item_links, \
register_sidebar_template
from navigation.api import register_links
from django_gpg.runtime import gpg
from django_gpg.exceptions import GPGDecryptionError
@@ -29,9 +28,11 @@ logger = logging.getLogger(__name__)
def has_embedded_signature(context):
return DocumentVersionSignature.objects.has_embedded_signature(context['object'])
def doesnt_have_detached_signature(context):
return DocumentVersionSignature.objects.has_detached_signature(context['object']) == False
def document_pre_open_hook(descriptor):
try:
result = gpg.decrypt_file(descriptor, close_descriptor=False)
@@ -43,6 +44,7 @@ def document_pre_open_hook(descriptor):
else:
return StringIO(result.data)
def document_post_save(sender, instance, **kwargs):
if kwargs.get('created', False):
DocumentVersionSignature.objects.signature_state(instance.document)

View File

@@ -3,7 +3,7 @@ import logging
from django.db import models
from django_gpg.runtime import gpg
from django_gpg.exceptions import GPGVerificationError, GPGDecryptionError
from django_gpg.exceptions import GPGVerificationError
logger = logging.getLogger(__name__)

View File

@@ -8,21 +8,15 @@ from django.http import HttpResponseRedirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.utils.safestring import mark_safe
from django.conf import settings
from django.template.defaultfilters import force_escape
from documents.models import Document, RecentDocument
from permissions.api import check_permissions
from common.utils import pretty_size, parse_range, urlquote, \
return_diff, encapsulate
from filetransfers.api import serve_file
from django_gpg.api import Key, SIGNATURE_STATES
from django_gpg.runtime import gpg
from django_gpg.exceptions import (GPGVerificationError, KeyFetchingError,
KeyImportError)
from django_gpg.api import SIGNATURE_STATES
from . import (PERMISSION_DOCUMENT_VERIFY, PERMISSION_SIGNATURE_UPLOAD,
PERMISSION_SIGNATURE_DOWNLOAD)