From b366f39d20588a4e08a7c1f186711e478f5db375 Mon Sep 17 00:00:00 2001 From: Alex Gaynor Date: Mon, 29 Sep 2014 11:07:05 -0700 Subject: Wrap lines appropriately --- docs/hazmat/backends/interfaces.rst | 3 ++- tests/hazmat/primitives/test_serialization.py | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 3b414339..77de4ac8 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -598,7 +598,8 @@ A specific ``backend`` may provide one or more of these interfaces. .. method:: load_pem_public_key(data) :param bytes data: PEM data to load. - :return: A new instance of the appropriate type of public key serialized data contains. + :return: A new instance of the appropriate type of public key + serialized data contains. :raises ValueError: If the data could not be deserialized. .. class:: TraditionalOpenSSLSerializationBackend 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 ) -- cgit v1.2.3