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

Change ivar name p→proc.

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-05-27 08:21:25 +00:00
parent de36fe52d1
commit 434a650799
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gnupg.py
View File

@ -740,19 +740,18 @@ use_agent: %s
if default_key: if default_key:
args.append(str("--default-key %s" % default_key)) args.append(str("--default-key %s" % default_key))
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) result = self._result_map['sign'](self)
proc = self._open_subprocess(args, passphrase is not None)
try: try:
stdin = p.stdin
if passphrase: if passphrase:
_util._write_passphrase(stdin, passphrase, self.encoding) _util._write_passphrase(proc.stdin, passphrase, self.encoding)
writer = _util._threaded_copy_data(file, stdin) writer = _util._threaded_copy_data(file, proc.stdin)
except IOError: except IOError as ioe:
log.exception("_sign_file(): Error writing message") log.exception("Error writing message: %s" % ioe.message)
writer = None writer = None
self._collect_output(p, result, writer, stdin) self._collect_output(proc, result, writer, proc.stdin)
return result return result
def verify(self, data): def verify(self, data):