diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2019-06-22 17:06:02 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2019-06-22 17:06:02 +0000 |
| commit | ae38f2c5a0db711ef573276bc745ee2384a197fa (patch) | |
| tree | 6029aafbda99fe85c3fac43db2646b446d564917 /python/olm/utility.py | |
| parent | 25662564d415b9d5486f1915c9d46e5851b058d0 (diff) | |
| parent | 61175c969b1de3ecd8c25478c69d6d1883dfa211 (diff) | |
Merge branch 'python/unicode_decode_errors' into 'master'
Python unicode decode errors when decrypting.
See merge request matrix-org/olm!4
Diffstat (limited to 'python/olm/utility.py')
| -rw-r--r-- | python/olm/utility.py | 1 |
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 |