Skip to content

Switch to the new utils.deprecation spelling #1140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alex merged 2 commits into from
Aug 13, 2022
Merged

Switch to the new utils.deprecation spelling #1140

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fd45c8
Switch to the new utils.deprecation spelling
davidben Aug 13, 2022
a8324ff
reformat
davidben Aug 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/OpenSSL/crypto.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3221,14 +3221,15 @@ def load_pkcs7_data(type: int, buffer: Union[str, bytes]) -> PKCS7:
return pypkcs7


load_pkcs7_data = utils.deprecated(
utils.deprecated(
load_pkcs7_data,
__name__,
(
"PKCS#7 support in pyOpenSSL is deprecated. You should use the APIs "
"in cryptography."
),
DeprecationWarning,
name="load_pkcs7_data",
)


Expand Down Expand Up @@ -3319,12 +3320,13 @@ def load_pkcs12(
return pkcs12


load_pkcs12 = utils.deprecated(
utils.deprecated(
load_pkcs12,
__name__,
(
"PKCS#12 support in pyOpenSSL is deprecated. You should use the APIs "
"in cryptography."
),
DeprecationWarning,
name="load_pkcs12",
)