Change variable names in GPG.sign() to be clearer.

testing/mmn/mktime_takes_localtime_not_gmtime
Isis Lovecruft 2013-05-21 12:57:24 +00:00
parent b5a0770d56
commit d9b7a85fe6
No known key found for this signature in database
GPG Key ID: A3ADB67A2CDB8B35
1 changed files with 7 additions and 5 deletions

View File

@ -723,16 +723,18 @@ use_agent: %s
% (data, kwargs[keyid]))
else:
log.warn("No 'sign_with' keyid given! Using default key.")
result = self._sign_file(message, **kwargs)
elif not _util._is_stream(message):
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.")
f = _util._make_binary_stream(message, self.encoding)
result = self._sign_file(f, **kwargs)
f.close()
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)))