aboutsummaryrefslogtreecommitdiffstats
path: root/tests/hazmat
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-29 19:23:06 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-09-29 19:23:06 -0500
commit9952434588fbadc9e0e5624f1821064dd0fbadff (patch)
tree5ee7effb6848f632b2afed030094c6ca24772880 /tests/hazmat
parent1cbe0a026ad01c250ef575289bb9c01ba303511b (diff)
parentb366f39d20588a4e08a7c1f186711e478f5db375 (diff)
downloadcryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.tar.gz
cryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.tar.bz2
cryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.zip
Merge pull request #1367 from alex/line-length
Wrap lines appropriately
Diffstat (limited to 'tests/hazmat')
-rw-r--r--tests/hazmat/primitives/test_serialization.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/hazmat/primitives/test_serialization.py b/tests/hazmat/primitives/test_serialization.py
index 5ee68b23..fc108d27 100644
--- a/tests/hazmat/primitives/test_serialization.py
+++ b/tests/hazmat/primitives/test_serialization.py
@@ -23,8 +23,7 @@ from cryptography.exceptions import _Reasons
from cryptography.hazmat.primitives import interfaces
from cryptography.hazmat.primitives.asymmetric import ec
from cryptography.hazmat.primitives.serialization import (
- load_pem_pkcs8_private_key, load_pem_private_key,
- load_pem_public_key,
+ load_pem_pkcs8_private_key, load_pem_private_key, load_pem_public_key,
load_pem_traditional_openssl_private_key
)