Skip to content

Commit 19b3827

Browse files
authored
Update comments for manylinux (#1232)
1 parent 0abf9ec commit 19b3827

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/OpenSSL/SSL.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -955,9 +955,9 @@ def set_default_verify_paths(self):
955955
the ``[email protected]`` `Homebrew <https://brew.sh>`_ formula installed
956956
in the default location.
957957
* Windows will not work.
958-
* manylinux1 cryptography wheels will work on most common Linux
958+
* manylinux cryptography wheels will work on most common Linux
959959
distributions in pyOpenSSL 17.1.0 and above. pyOpenSSL detects the
960-
manylinux1 wheel and attempts to load roots via a fallback path.
960+
manylinux wheel and attempts to load roots via a fallback path.
961961
962962
:return: None
963963
"""
@@ -982,13 +982,13 @@ def set_default_verify_paths(self):
982982
default_dir = _ffi.string(_lib.X509_get_default_cert_dir())
983983
default_file = _ffi.string(_lib.X509_get_default_cert_file())
984984
# Now we check to see if the default_dir and default_file are set
985-
# to the exact values we use in our manylinux1 builds. If they are
985+
# to the exact values we use in our manylinux builds. If they are
986986
# then we know to load the fallbacks
987987
if (
988988
default_dir == _CRYPTOGRAPHY_MANYLINUX_CA_DIR
989989
and default_file == _CRYPTOGRAPHY_MANYLINUX_CA_FILE
990990
):
991-
# This is manylinux1, let's load our fallback paths
991+
# This is manylinux, let's load our fallback paths
992992
self._fallback_default_verify_paths(
993993
_CERTIFICATE_FILE_LOCATIONS, _CERTIFICATE_PATH_LOCATIONS
994994
)
@@ -1007,7 +1007,7 @@ def _check_env_vars_set(self, dir_env_var, file_env_var):
10071007
def _fallback_default_verify_paths(self, file_path, dir_path):
10081008
"""
10091009
Default verify paths are based on the compiled version of OpenSSL.
1010-
However, when pyca/cryptography is compiled as a manylinux1 wheel
1010+
However, when pyca/cryptography is compiled as a manylinux wheel
10111011
that compiled location can potentially be wrong. So, like Go, we
10121012
will try a predefined set of paths and attempt to load roots
10131013
from there.

tests/test_ssl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1179,7 +1179,7 @@ def test_load_verify_locations_wrong_args(self):
11791179
@pytest.mark.skipif(
11801180
not platform.startswith("linux"),
11811181
reason="Loading fallback paths is a linux-specific behavior to "
1182-
"accommodate pyca/cryptography manylinux1 wheels",
1182+
"accommodate pyca/cryptography manylinux wheels",
11831183
)
11841184
def test_fallback_default_verify_paths(self, monkeypatch):
11851185
"""

0 commit comments

Comments
 (0)