matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PEP8 Cleanups

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/document_signatures/managers.py
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__)
@@ -33,24 +33,24 @@ class DocumentVersionSignatureManager(models.Manager):
document_signature.save()
else:
raise Exception('document already has an embedded signature')
def has_detached_signature(self, document):
document_signature, created = self.model.objects.get_or_create(
document_version=document.latest_version,
)
)
if document_signature.signature_file:
return True
else:
return False
def has_embedded_signature(self, document):
logger.debug('document: %s' % document)
if self.signature_state(document):
return True
else:
return False
def signature_state(self, document):
document_signature, created = self.model.objects.get_or_create(
document_version=document.latest_version,
@@ -65,26 +65,26 @@ class DocumentVersionSignatureManager(models.Manager):
except GPGVerificationError:
document_signature.signature_state = None
finally:
document_signature.save()
document_signature.save()
#document_signature.signature_state = self.verify_signature(document).status
#document_signature.save()
return document_signature.signature_state
def detached_signature(self, document):
document_signature, created = self.model.objects.get_or_create(
document_version=document.latest_version,
)
)
return document_signature.signature_file.storage.open(document_signature.signature_file.path)
def verify_signature(self, document):
if self.has_detached_signature(document):
logger.debug('has detached signature')
args = (document.open(raw=True), self.detached_signature(document))
else:
args = (document.open(raw=True),)
try:
return gpg.verify_w_retry(*args)
except GPGVerificationError: