cadata param can (and PEM-encoded cadata must) be unicode under PY2 #3150
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The documentation for that parameter states: "The cadata object, if present, is either an ASCII string of one or more PEM-encoded certificates or a bytes-like object of DER-encoded certificates." Similar wording is used for PY2 and PY3. But that's a bit of a backporting bug in the documentation, since "ASCII string" and "bytes-like object" sound like they could both be str under PY2. In fact, if the type is str it's assumed to be DER-encoded and PEM-encoded cadata must use the unicode type under PY2 (https://bugs.python.org/issue37079): https://github.com/python/cpython/blob/2149a9ad/Modules/_ssl.c#L3011 Thus, these type declarations should use Union[Text, bytes, None] instead of Union[str, bytes, None]. Also, _create_unverified_context exists in Python 2: https://github.com/python/cpython/blob/2149a9ad/Lib/ssl.py#L448
srittau
requested changes
Jul 26, 2019
sfreilich
commented
Jul 26, 2019
|
There is a merge conflict now. |
Resolved, I think. |
|
CI is failing now though (haven't checked why). |
|
Whitespace typo in the merge, missed when looking at the diff. Should be fixed. |
|
This seems to be fixed, can someone merge this, please? |
srittau
approved these changes
Aug 23, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The documentation for that parameter states: "The cadata object, if
present, is either an ASCII string of one or more PEM-encoded
certificates or a bytes-like object of DER-encoded certificates."
Similar wording is used for PY2 and PY3. But that's a bit of a
backporting bug in the documentation, since "ASCII string" and
"bytes-like object" sound like they could both be str under PY2. In
fact, if the type is str it's assumed to be DER-encoded and
PEM-encoded cadata must use the unicode type under PY2
(https://bugs.python.org/issue37079):
https://github.com/python/cpython/blob/2149a9ad/Modules/_ssl.c#L3011
Thus, these type declarations should use Union[Text, bytes, None]
instead of Union[str, bytes, None].
Also, _create_unverified_context exists in Python 2:
https://github.com/python/cpython/blob/2149a9ad/Lib/ssl.py#L448