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

Clean up the logging statements in _sign_file().

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-04-16 23:07:37 +00:00
parent 70b8269aaf
commit 301fd6f89c
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnupg/gnupg.py
View File

@ -424,7 +424,7 @@ class GPG(object):
def _sign_file(self, file, keyid=None, passphrase=None, clearsign=True, def _sign_file(self, file, keyid=None, passphrase=None, clearsign=True,
detach=False, binary=False): detach=False, binary=False):
"""Create a signature for a file.""" """Create a signature for a file."""
logger.debug("GPG._sign_file(): %s", file) logger.debug("_sign_file(): %s", file)
if binary: if binary:
args = ['--sign'] args = ['--sign']
else: else:
@ -433,10 +433,8 @@ class GPG(object):
if clearsign: if clearsign:
args.append("--clearsign") args.append("--clearsign")
if detach: if detach:
logger.warn( logger.warn("Cannot use both --clearsign and --detach-sign.")
"Cannot use --clearsign and --detach-sign simultaneously.") logger.warn("Using default GPG behaviour: --clearsign only.")
logger.warn(
"Using default GPG behaviour: --clearsign only.")
elif detach and not clearsign: elif detach and not clearsign:
args.append("--detach-sign") args.append("--detach-sign")
@ -444,8 +442,8 @@ class GPG(object):
args.append(str("--default-key %s" % keyid)) args.append(str("--default-key %s" % keyid))
result = self._result_map['sign'](self) result = self._result_map['sign'](self)
#We could use _handle_io here except for the fact that if the ## We could use _handle_io here except for the fact that if the
#passphrase is bad, gpg bails and you can't write the message. ## passphrase is bad, gpg bails and you can't write the message.
p = self._open_subprocess(args, passphrase is not None) p = self._open_subprocess(args, passphrase is not None)
try: try:
stdin = p.stdin stdin = p.stdin
@ -453,7 +451,7 @@ class GPG(object):
_write_passphrase(stdin, passphrase, self.encoding) _write_passphrase(stdin, passphrase, self.encoding)
writer = _threaded_copy_data(file, stdin) writer = _threaded_copy_data(file, stdin)
except IOError: except IOError:
logging.exception("error writing message") logger.exception("_sign_file(): Error writing message")
writer = None writer = None
self._collect_output(p, result, writer, stdin) self._collect_output(p, result, writer, stdin)
return result return result