copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fig gpg encoding error. Fixes #6807

Browse source
This commit is contained in:
Yann Leboulanger 2011-05-11 21:31:56 +02:00
parent 2265a80e9f
commit e8095fcdcb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/common/gnupg.py
View file

@ -455,7 +455,7 @@ class GPG(object):
result = DeleteResult() # any result will do result = DeleteResult() # any result will do
self._collect_output(p, result, stdin=p.stdin) self._collect_output(p, result, stdin=p.stdin)
logger.debug('export_keys result: %r', result.data) 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): def list_keys(self, secret=False):
""" list the keys currently in the keyring """ list the keys currently in the keyring
@ -487,7 +487,7 @@ class GPG(object):
# Get the response information # Get the response information
result = ListKeys() result = ListKeys()
self._collect_output(p, result, stdin=p.stdin) 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() valid_keywords = 'pub uid sec fpr sub'.split()
for line in lines: for line in lines:
if self.verbose: if self.verbose:
@ -869,7 +869,7 @@ class Crypt(Verify):
__bool__ = __nonzero__ __bool__ = __nonzero__
def __str__(self): def __str__(self):
return self.data.decode(self.encoding) return self.data.decode(self.encoding, 'replace')
def handle_status(self, key, value): def handle_status(self, key, value):
if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION", if key in ("ENC_TO", "USERID_HINT", "GOODMDC", "END_DECRYPTION",
@ -958,7 +958,7 @@ class Sign(object):
__bool__ = __nonzero__ __bool__ = __nonzero__
def __str__(self): def __str__(self):
return self.data.decode(self.encoding) return self.data.decode(self.encoding, 'replace')
def handle_status(self, key, value): def handle_status(self, key, value):
if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE", if key in ("USERID_HINT", "NEED_PASSPHRASE", "BAD_PASSPHRASE",