diff options
| author | Kali Kaneko (leap communications) <kali@leap.se> | 2016-07-06 20:44:54 +0200 |
|---|---|---|
| committer | Kali Kaneko (leap communications) <kali@leap.se> | 2016-07-06 20:45:02 +0200 |
| commit | 794911534ce8121acd7dba89cc53c20fe088e5bd (patch) | |
| tree | 78dd0bf89b5880717e7b6a7f80414a305c8251f8 | |
| parent | 59ebc76b97ed91f18b88e1eedcc66bcc6e0331d5 (diff) | |
fix pep8/flakes
| -rw-r--r-- | memoryhole/memoryhole.old.py | 7 | ||||
| -rw-r--r-- | setup.py | 3 | ||||
| -rw-r--r-- | tests/skip_test_holes.py | 7 |
3 files changed, 10 insertions, 7 deletions
diff --git a/memoryhole/memoryhole.old.py b/memoryhole/memoryhole.old.py index 8ec2a4d..e6b93b9 100644 --- a/memoryhole/memoryhole.old.py +++ b/memoryhole/memoryhole.old.py @@ -192,7 +192,6 @@ def _boundary_factory(start): return _gen_boundary - def _wrap_with_header(msg, boundary=None): body = email.message.Message() body.set_payload(msg.get_payload()) @@ -243,9 +242,9 @@ if __name__ == "__main__": key_data = key_f.read() gpg.import_keys(key_data) - #if not gpg.list_keys(): - #key_input = gpg.gen_key_input(key_length=1024, key_type='RSA') - #gpg.gen_key(key_input) + # if not gpg.list_keys(): + # key_input = gpg.gen_key_input(key_length=1024, key_type='RSA') + # gpg.gen_key(key_input) with open(msg_path) as f: basetext = f.read() @@ -8,5 +8,4 @@ setup(name='memoryhole', author='Kali Kaneko', author_email='kali@leap.se', url='https://leap.se', - packages=['memoryhole'], - ) + packages=['memoryhole']) diff --git a/tests/skip_test_holes.py b/tests/skip_test_holes.py index 92ac60e..4261087 100644 --- a/tests/skip_test_holes.py +++ b/tests/skip_test_holes.py @@ -29,7 +29,7 @@ class MemoryHoleTest(unittest.TestCase): expected = _load_expected_msg(sampleid) msg = memoryhole.protect_message( orig, self.gpg, boundary=boundary, - sign_digest_algo='SHA256', passphrase='_' + keyowner + '_') + sign_digest_algo='SHA256', passphrase='_' + keyowner + '_') # TODO -- how to compare messages?? self.assertEqual(dict(msg), dict(expected)) @@ -42,23 +42,28 @@ def _load_key(keyname, gpg): keydata = keyf.read() gpg.import_keys(keydata) + def _get_raw_message(identifier): path = os.path.join(corpus, 'sample.' + identifier + '.eml') return _parse(_load_file(path)) + def _load_expected_msg(identifier): path = os.path.join(corpus, 'expected.' + identifier + '.eml') return _parse(_load_file(path)) + def _load_file(path): with open(path) as f: raw = f.read() return raw + def _parse(raw): parser = Parser() return parser.parsestr(raw) + def _boundary_factory(start): counter = {'value': ord(start)} |