summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaurav Malhotra <malhotrag@gmail.com>2019-01-22 00:09:19 +0530
committerAlex Gaynor <alex.gaynor@gmail.com>2019-01-21 12:39:19 -0600
commit4121e2555d07bbba501ac237408a0eea1b41f467 (patch)
tree8e64edf2cc109852327f2045ca12c679e50a30d4
parent4183beb4bc3f72d656dd9f18acb0ddcabca5ca79 (diff)
downloadpyopenssl-git-4121e2555d07bbba501ac237408a0eea1b41f467.tar.gz
Fixes incorrect rtype in documentation (#802)
rtype for the following was incorrect: X509Req.from_cryptography X509.from_cryptography
-rw-r--r--src/OpenSSL/crypto.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/OpenSSL/crypto.py b/src/OpenSSL/crypto.py
index 715e1ae..255ec8f 100644
--- a/src/OpenSSL/crypto.py
+++ b/src/OpenSSL/crypto.py
@@ -902,7 +902,7 @@ class X509Req(object):
:param crypto_req: A ``cryptography`` X.509 certificate signing request
:type crypto_req: ``cryptography.x509.CertificateSigningRequest``
- :rtype: PKey
+ :rtype: X509Req
.. versionadded:: 17.1.0
"""
@@ -1115,7 +1115,7 @@ class X509(object):
:param crypto_key: A ``cryptography`` X.509 certificate.
:type crypto_key: ``cryptography.x509.Certificate``
- :rtype: PKey
+ :rtype: X509
.. versionadded:: 17.1.0
"""