aboutsummaryrefslogtreecommitdiff
path: root/python/olm/utility.py
diff options
context:
space:
mode:
authorDamir Jelić <poljar@termina.org.uk>2019-06-18 13:46:57 +0200
committerDamir Jelić <poljar@termina.org.uk>2019-06-18 13:50:46 +0200
commit2f5590bf38e5995a36f770c04cfbf31eb9070eca (patch)
tree299e68cd3b9ea33f212cd1a7c4fcf0bbbca4bfc8 /python/olm/utility.py
parente1a4e6ebf1568935a57ba8cec48e43dd7c1ebcd3 (diff)
olm: Allow decryption functions to define how to handle unicode decode errors.
This patch changes the decryption functions not to fail if there was an unicode decode error while converting the decrypted bytes plaintext into a native python string. Characters that cannot be decoded as unicode are now replaced with the unicode replacement character (U+FFFD). The old behaviour of raising an UnicodeDecodeError can be achieved by passing the "strict" error handling scheme to the decrypt function.
Diffstat (limited to 'python/olm/utility.py')
-rw-r--r--python/olm/utility.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/python/olm/utility.py b/python/olm/utility.py
index 10d5ab4..bddef38 100644
--- a/python/olm/utility.py
+++ b/python/olm/utility.py
@@ -32,6 +32,7 @@ Examples:
# pylint: disable=redefined-builtin,unused-import
from typing import AnyStr, Type
+
from future.utils import bytes_to_native_str
# pylint: disable=no-name-in-module