Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim-plugins.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hörist <philipp@hoerist.com>2018-12-15 18:16:39 +0300
committerPhilipp Hörist <philipp@hoerist.com>2018-12-15 18:29:26 +0300
commitd45a63658c3f8ebb965c202b79879374fc2c3303 (patch)
tree8a8814ecb2d9b5ae4a3c86507e87781539215ce8
parentf9fd6bdd1c4d348ad164fcd0f1ad60cb9458b191 (diff)
[omemo] Remove python2 compat code
-rw-r--r--omemo/omemo/aes_gcm.py6
1 files changed, 1 insertions, 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):