diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-29 19:23:06 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-29 19:23:06 -0500 |
| commit | 9952434588fbadc9e0e5624f1821064dd0fbadff (patch) | |
| tree | 5ee7effb6848f632b2afed030094c6ca24772880 | |
| parent | 1cbe0a026ad01c250ef575289bb9c01ba303511b (diff) | |
| parent | b366f39d20588a4e08a7c1f186711e478f5db375 (diff) | |
| download | cryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.tar.gz cryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.tar.bz2 cryptography-9952434588fbadc9e0e5624f1821064dd0fbadff.zip | |
Merge pull request #1367 from alex/line-length
Wrap lines appropriately
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 3 | ||||
| -rw-r--r-- | 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 ) |