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/sas.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/sas.py')
| -rw-r--r-- | python/olm/sas.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/python/olm/sas.py b/python/olm/sas.py index c12b7bc..bea1dd0 100644 --- a/python/olm/sas.py +++ b/python/olm/sas.py @@ -30,15 +30,15 @@ Examples: """ -from functools import wraps from builtins import bytes +from functools import wraps from typing import Optional from future.utils import bytes_to_native_str from _libolm import ffi, lib -from ._compat import URANDOM, to_bytes, to_bytearray +from ._compat import URANDOM, to_bytearray, to_bytes from ._finalize import track_for_finalization |