Add check for correct h2 version range #3402
Merged
Conversation
This file contains hidden or 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
|
@sethmlarson friendly nudge |
|
@sethmlarson @illia-v @shazow nudge^3 |
illia-v
reviewed
Jun 26, 2024
src/urllib3/__init__.py
Outdated
Comment on lines
48
to
61
| # Ensure that Python is compiled with h2>=4.0.0 and <5.0.0 | ||
| # If the 'h2' module isn't installed at all that's | ||
| # fine, we only care if the module is installed. | ||
| try: | ||
| import h2 # type: ignore[import-untyped] | ||
| except ImportError: | ||
| pass | ||
| else: | ||
| if not (h2.__version__ >= "4.0.0" and h2.__version__ < "5.0.0"): | ||
| raise ImportError( | ||
| "urllib3 v2 supports h2 version 4.x.x, currently " | ||
| f"the 'h2' module is compiled with {h2.__version__!r}. " | ||
| "See: https://github.com/urllib3/urllib3/issues/3290" | ||
| ) |
There was a problem hiding this comment.
Since the HTTP/2 support is rudimentary and it has to be enabled explicitly by calling urllib3.http2.inject_into_urllib3, I believe we shouldn't raise the error at the top level. This can be breaking needlessly for environments that have both urllib3 and h2 installed but never call inject_into_urllib3.
sethmlarson
reviewed
Aug 12, 2024
src/urllib3/http2/__init__.py
Outdated
| @@ -11,6 +13,15 @@ | |||
|
|
|||
|
|
|||
| def inject_into_urllib3() -> None: | |||
| # First check if h2 version is valid | |||
| h2_version = version("h2") | |||
| if not h2_version.startswith("4"): | |||
There was a problem hiding this comment.
super nit: Shall we do 4. instead of 4?
sethmlarson
previously approved these changes
Aug 12, 2024
sethmlarson
approved these changes
Aug 12, 2024
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.
Tested according to contribution guidelines.
Closes #3290.