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

PEP8 cleanups, E501.

Browse Source
This commit is contained in:
Roberto Rosario
2015-07-23 04:05:29 -04:00
parent 0a0a92116e
commit 3b728328ad
48 changed files with 613 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mayan/apps/django_gpg/api.py
View File

@@ -96,7 +96,9 @@ class Key(object):
return ', '.join(self.uids)
def __str__(self):
return '%s "%s" (%s)' % (self.key_id, self.user_ids, KEY_TYPES.get(self.type, _('Unknown')))
return '%s "%s" (%s)' % (
self.key_id, self.user_ids, KEY_TYPES.get(self.type, _('Unknown'))
)
def __unicode__(self):
return unicode(self.__str__())
@@ -133,9 +135,13 @@ class GPG(object):
try:
self.gpg = gnupg.GPG(**kwargs)
except OSError as exception:
raise GPGException('ERROR: GPG initialization error; Make sure the GPG binary is properly installed; %s' % exception)
raise GPGException(
'ERROR: GPG initialization error; Make sure the GPG binary is properly installed; %s' % exception
)
except Exception as exception:
raise GPGException('ERROR: GPG initialization error; %s' % exception)
raise GPGException(
'ERROR: GPG initialization error; %s' % exception
)
def verify_file(self, file_input, detached_signature=None, fetch_key=False):
"""
@@ -155,7 +161,9 @@ class GPG(object):
signature_file = StringIO()
signature_file.write(detached_signature.read())
signature_file.seek(0)
verify = self.gpg.verify_file(signature_file, data_filename=filename)
verify = self.gpg.verify_file(
signature_file, data_filename=filename
)
signature_file.close()
else:
verify = self.gpg.verify_file(input_descriptor)
@@ -169,7 +177,9 @@ class GPG(object):
if fetch_key:
try:
self.receive_key(verify.key_id)
return self.verify_file(input_descriptor, detached_signature, fetch_key=False)
return self.verify_file(
input_descriptor, detached_signature, fetch_key=False
)
except KeyFetchingError:
return verify
else:
@@ -259,7 +269,9 @@ class GPG(object):
return Key.get(self, key.fingerprint)
def delete_key(self, key):
status = self.gpg.delete_keys(key.fingerprint, key.type == 'sec').status
status = self.gpg.delete_keys(
key.fingerprint, key.type == 'sec'
).status
if status == 'Must delete secret key first':
self.delete_key(Key.get(self, key.fingerprint, secret=True))
self.delete_key(key)
@@ -270,7 +282,9 @@ class GPG(object):
for keyserver in self.keyservers:
import_result = self.gpg.recv_keys(keyserver, key_id)
if import_result:
return Key.get(self, import_result.fingerprints[0], secret=False)
return Key.get(
self, import_result.fingerprints[0], secret=False
)
raise KeyFetchingError