about summary refs log tree commit diff
path: root/test/test_aes.py
diff options
context:
space:
mode:
authorJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-06-03 23:50:38 +0200
committerJaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com>2015-06-03 23:50:38 +0200
commit4c8fea92f350d5a3f33d505980ac750b05a9cd34 (patch)
treef78beb52afeedf0eb2f7c03dd258f020afcbd3f1 /test/test_aes.py
parentd073055dcd5fdf737f028ecc1bd5a57c48e1193e (diff)
downloadyoutube-dl-4c8fea92f350d5a3f33d505980ac750b05a9cd34.tar.gz
youtube-dl-4c8fea92f350d5a3f33d505980ac750b05a9cd34.tar.xz
youtube-dl-4c8fea92f350d5a3f33d505980ac750b05a9cd34.zip
[test/aes] Fix on python 3.3 and higher
Since 878563c847fa5248eedbd44187536dec04643eaf the aes functions only accepts the base64 data as a unicode string.
Diffstat (limited to 'test/test_aes.py')
-rw-r--r--test/test_aes.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test_aes.py b/test/test_aes.py
index 4dc7de7b5..315a3f5ae 100644
--- a/test/test_aes.py
+++ b/test/test_aes.py
@@ -39,7 +39,7 @@ class TestAES(unittest.TestCase):
         encrypted = base64.b64encode(
             intlist_to_bytes(self.iv[:8]) +
             b'\x17\x15\x93\xab\x8d\x80V\xcdV\xe0\t\xcdo\xc2\xa5\xd8ksM\r\xe27N\xae'
-        )
+        ).decode('utf-8')
         decrypted = (aes_decrypt_text(encrypted, password, 16))
         self.assertEqual(decrypted, self.secret_msg)
 
@@ -47,7 +47,7 @@ class TestAES(unittest.TestCase):
         encrypted = base64.b64encode(
             intlist_to_bytes(self.iv[:8]) +
             b'\x0b\xe6\xa4\xd9z\x0e\xb8\xb9\xd0\xd4i_\x85\x1d\x99\x98_\xe5\x80\xe7.\xbf\xa5\x83'
-        )
+        ).decode('utf-8')
         decrypted = (aes_decrypt_text(encrypted, password, 32))
         self.assertEqual(decrypted, self.secret_msg)