Unsignedio
/
python-gnupg
mirror of https://github.com/markqvist/python-gnupg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

sign_with → default_key. Also, deduplicate code.

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-05-28 11:00:13 +00:00
parent 4bd45d06cd
commit 694ae87410
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/gnupg.py
View File

@ -224,26 +224,18 @@ use_agent: %s
:param bool detach: If True, create a detached signature.
:param bool binary: If True, do not ascii armour the output.
"""
if isinstance(data, file):
log.warn("Note: This function is not for signing other keys,")
log.warn(" see the docstring for GPG.sign()")
if 'keyid' in kwargs.items():
log.info("Signing file '%r' with keyid: %s"
% (data, kwargs[keyid]))
else:
log.warn("No 'sign_with' keyid given! Using default key.")
result = self._sign_file(data, **kwargs)
if 'default_key' in kwargs.items():
log.info("Signing message '%r' with keyid: %s"
% (data, kwargs['default_key']))
else:
log.warn("No 'default_key' given! Using first key on secring.")
if isinstance(data, file):
result = self._sign_file(data, **kwargs)
elif not _is_stream(data):
if 'keyid' in kwargs.items():
log.info("Signing data string '%s' with keyid: %s"
% (data, kwargs[keyid]))
else:
log.warn("No 'sign_with' keyid given! Using default key.")
stream = _make_binary_stream(data, self._encoding)
result = self._sign_file(stream, **kwargs)
stream.close()
else:
log.warn("Unable to sign message '%s' with type %s"
% (data, type(data)))