changeset b6788953d3b6 in /home/hg/repos/gajim
details:http://hg.gajim.org/gajim?cmd=changeset;node=b6788953d3b6 description: fig gpg encoding error. Fixes #6807
diffstat:
src/common/gnupg.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diffs (39 lines):
diff -r 9fb0c07f88a7 -r b6788953d3b6 src/common/gnupg.py --- a/src/common/gnupg.py Wed May 11 20:42:44 2011 +0200 +++ b/src/common/gnupg.py Wed May 11 21:31:56 2011 +0200 @@ -455,7 +455,7 @@ result = DeleteResult() # any result will do self._collect_output(p, result, stdin=p.stdin) logger.debug('export_keys result: %r', result.data) - return result.data.decode(self.encoding) + return result.data.decode(self.encoding, 'replace')
def list_keys(self, secret=False): """ list the keys currently in the keyring @@ -487,7 +487,7 @@ # Get the response information result = ListKeys() self._collect_output(p, result, stdin=p.stdin) - lines = result.data.decode(self.encoding).splitlines() + lines = result.data.decode(self.encoding, 'replace').splitlines() valid_keywords = 'pub uid sec fpr sub'.split() for line in lines: if self.verbose: @@ -869,7 +869,7 @@ __bool__ = __nonzero__
def __str__(self): - return self.data.decode(self.encoding) + return self.data.decode(self.encoding, 'replace')
def handle_status(self, key, value): if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION", @@ -958,7 +958,7 @@ __bool__ = __nonzero__
def __str__(self): - return self.data.decode(self.encoding) + return self.data.decode(self.encoding, 'replace')
def handle_status(self, key, value): if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE",