From 529dbdf27804f12da80907d25c412d10e9fa3763 Mon Sep 17 00:00:00 2001
From: Victor Shyba <victor1984@riseup.net>
Date: Thu, 17 Nov 2016 01:33:04 -0300
Subject: [style] fix pep8 and confs

Fixes setup.cfg, adding current exclude rules, simplified tox.ini to use
setup.cfg and fixed all.
---
 testing/tests/client/test_crypto.py | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

(limited to 'testing/tests/client/test_crypto.py')

diff --git a/testing/tests/client/test_crypto.py b/testing/tests/client/test_crypto.py
index dc3054f2..483c7803 100644
--- a/testing/tests/client/test_crypto.py
+++ b/testing/tests/client/test_crypto.py
@@ -59,8 +59,8 @@ class AESTest(unittest.TestCase):
         data = snowden1
         block = 16
 
-        for i in range(len(data)/block):
-            chunk = data[i * block:(i+1)*block]
+        for i in range(len(data) / block):
+            chunk = data[i * block:(i + 1) * block]
             aes.write(chunk)
         aes.end()
 
@@ -69,7 +69,6 @@ class AESTest(unittest.TestCase):
 
         assert ciphertext_chunked == ciphertext
 
-
     def test_decrypt(self):
         key = 'A' * 32
         iv = 'A' * 16
@@ -82,8 +81,8 @@ class AESTest(unittest.TestCase):
         fd = BytesIO()
         aes = _crypto.AESDecryptor(key, iv, fd)
 
-        for i in range(len(ciphertext)/block):
-            chunk = ciphertext[i * block:(i+1)*block]
+        for i in range(len(ciphertext) / block):
+            chunk = ciphertext[i * block:(i + 1) * block]
             aes.write(chunk)
         aes.end()
 
@@ -91,7 +90,6 @@ class AESTest(unittest.TestCase):
         assert cleartext_chunked == data
 
 
-
 class BlobTestCase(unittest.TestCase):
 
     class doc_info:
@@ -108,13 +106,13 @@ class BlobTestCase(unittest.TestCase):
 
         blob = _crypto.BlobEncryptor(
             self.doc_info, inf, result=outf,
-            secret='A' * 96, iv='B'*16)
+            secret='A' * 96, iv='B' * 16)
 
         encrypted = yield blob.encrypt()
         data = base64.urlsafe_b64decode(encrypted.getvalue())
 
         assert data[0] == '\x80'
-        ts, sch, meth  = struct.unpack(
+        ts, sch, meth = struct.unpack(
             'Qbb', data[1:11])
         assert sch == 1
         assert meth == 1
@@ -128,13 +126,12 @@ class BlobTestCase(unittest.TestCase):
 
         ciphertext = data[71:-64]
         aes_key = _crypto._get_sym_key_for_doc(
-            self.doc_info.doc_id, 'A'*96)
-        assert ciphertext == _aes_encrypt(aes_key, 'B'*16, snowden1)
+            self.doc_info.doc_id, 'A' * 96)
+        assert ciphertext == _aes_encrypt(aes_key, 'B' * 16, snowden1)
 
-        decrypted = _aes_decrypt(aes_key, 'B'*16, ciphertext)
+        decrypted = _aes_decrypt(aes_key, 'B' * 16, ciphertext)
         assert str(decrypted) == snowden1
 
-
     @defer.inlineCallbacks
     def test_blob_decryptor(self):
 
@@ -154,7 +151,6 @@ class BlobTestCase(unittest.TestCase):
         decrypted = yield decryptor.decrypt()
         assert decrypted.getvalue() == snowden1
 
-
     @defer.inlineCallbacks
     def test_encrypt_and_decrypt(self):
         """
@@ -173,7 +169,6 @@ class BlobTestCase(unittest.TestCase):
         assert len(decrypted) != 0
         assert json.loads(decrypted) == payload
 
-
     @defer.inlineCallbacks
     def test_decrypt_with_wrong_mac_raises(self):
         """
@@ -193,8 +188,7 @@ class BlobTestCase(unittest.TestCase):
         doc2.set_json(json.dumps({"raw": str(newraw)}))
 
         with pytest.raises(_crypto.InvalidBlob):
-            decrypted = yield crypto.decrypt_doc(doc2)
-
+            yield crypto.decrypt_doc(doc2)
 
 
 class RecoveryDocumentTestCase(BaseSoledadTest):
@@ -283,7 +277,6 @@ class SoledadSecretsTestCase(BaseSoledadTest):
             "Should have a secret at this point")
 
 
-
 class SoledadCryptoAESTestCase(BaseSoledadTest):
 
     def test_encrypt_decrypt_sym(self):
-- 
cgit v1.2.3