From beadae628a5adf52269ad1128101f47f04f1e9cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sat, 15 Dec 2018 16:16:39 +0100 Subject: [PATCH] [omemo] Remove python2 compat code --- omemo/omemo/aes_gcm.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/omemo/omemo/aes_gcm.py b/omemo/omemo/aes_gcm.py index 4d92e87..ebc5235 100644 --- a/omemo/omemo/aes_gcm.py +++ b/omemo/omemo/aes_gcm.py @@ -32,11 +32,7 @@ def encrypt(key, iv, plaintext): def decrypt(key, iv, ciphertext): - plaintext = aes_decrypt(key, iv, ciphertext).decode('utf-8') - if sys.version_info < (3, 0): - return unicode(plaintext) - else: - return plaintext + return aes_decrypt(key, iv, ciphertext).decode('utf-8') class NoValidSessions(Exception):