diff options
author | Kali Kaneko <kali@leap.se> | 2014-04-09 14:39:06 -0500 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2014-04-09 14:39:06 -0500 |
commit | 9490db0a41577ddde3affdfbba154b4f80fd24d9 (patch) | |
tree | d8fc043a2fd75de12de85b6d08a38f4d73b76639 /src/leap/keymanager/openpgp.py | |
parent | 9c3c2ea07eb0d833765220e690d4ecd2b7b3cf40 (diff) | |
parent | b25f3ae5ecaa70abaf80edc62931b5980c14e637 (diff) |
Merge tag '0.3.8' into deb-0.3.8
Tag leap.keymanager version 0.3.8
Conflicts:
pkg/requirements.pip
Diffstat (limited to 'src/leap/keymanager/openpgp.py')
-rw-r--r-- | src/leap/keymanager/openpgp.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/leap/keymanager/openpgp.py b/src/leap/keymanager/openpgp.py index 4276b19..950d022 100644 --- a/src/leap/keymanager/openpgp.py +++ b/src/leap/keymanager/openpgp.py @@ -17,12 +17,10 @@ """ Infrastructure for using OpenPGP keys in Key Manager. """ -import locale import logging import os import re import shutil -import sys import tempfile from contextlib import closing @@ -522,7 +520,7 @@ class OpenPGPScheme(EncryptionScheme): return result.data except errors.GPGError as e: logger.error('Failed to decrypt: %s.' % str(e)) - raise error.EncryptError() + raise errors.EncryptError() def decrypt(self, data, privkey, passphrase=None, verify=None): """ @@ -564,15 +562,7 @@ class OpenPGPScheme(EncryptionScheme): 'Failed to verify signature with key %s: %s' % (verify.key_id, result.stderr)) - # XXX: this is the encoding used by gpg module - # https://github.com/isislovecruft/python-gnupg/\ - # blob/master/gnupg/_meta.py#L121 - encoding = locale.getpreferredencoding() - if encoding is None: - encoding = sys.stdin.encoding - if encoding is None: - encoding = 'utf-8' - return result.data.decode(encoding, 'replace') + return result.data except errors.GPGError as e: logger.error('Failed to decrypt: %s.' % str(e)) raise errors.DecryptError(str(e)) |