Support Python 3.12 #3691
Merged
Support Python 3.12 #3691
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
davidmreed
approved these changes
Nov 7, 2023
`called_once_with` is not a valid (assertion) method and therefore an instance of mock.Mock is returned. Because instances of mock.Mock evaluate to true, the assertion is equivalent to assert True. See: https://discuss.python.org/t/include-prefix-called-in-list-of-forbidden-method-prefixes-for-mock-objects-in-unsafe-mode/22249/4
`ssl.wrap_socket()` has been discouraged since Python 3.2, deprecated since 3.7, and finally removed in 3.12. In this commit, the ssl.wrap_socket function has been removed and replaced with the recommended approach using ssl.SSLContext. Previously, ssl.wrap_socket internally set up the SSL context, including loading certificates. Now, we're doing that explicitly with ssl.SSLContext. On the testing side, the previous workaround for suppressing the CERTIFICATE_VERIFY_FAILED error has been adapted to utilize the context creation method. A note (FIXME): We're currently using ssl.PROTOCOL_TLS for compatibility, but once we drop Python 3.8 support, we should shift to ssl.PROTOCOL_TLS_SERVER, as Python 3.10 no longer includes the generic one.
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.
Changes needed to get 3.12 working:
Replace deprecated ssl.wrap_socket in OAuth client
ssl.wrap_socket()has been discouraged since Python 3.2, deprecated since 3.7, and finally removed in 3.12. In this PR, thessl.wrap_socketfunction has been removed and replaced with the recommended approach usingssl.SSLContext. Previously,ssl.wrap_socketinternally set up the SSL context, including loading certificates. Now, we're doing that explicitly withssl.SSLContext. This is a substantive, but low-risk, change.On the testing side, the previous workaround for suppressing the
CERTIFICATE_VERIFY_FAILEDerror has been adapted to utilize the context creation method.Remove invalid assertions
called_onceandcalled_once_withare not valid assertions on mock objects, meaning an instance ofmock.Mockis returned. Because instances ofmock.Mockevaluate to true, the assertion is equivalent toassert True. Those invalid assertions throw anAttributeErrorin Python 3.12, so this PR replaces them with valid assertions and updates some of the expected calls.