Avoid crashing on importing localtime when TZ is malformed #1100
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
…rmed When `pytz` is _not_ installed, importing `babel.localtime` could fail (repeatedly) when the `TZ` environment variable is malformed enough to be caught by `_validate_tzfile_path`, which might throw a certain `ValueError`. (When `pytz` is installed, it would raise an `UnknownTimeZoneError` we already catch and ignore for the same sort of input.) Fixes #1092
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1100 +/- ##
==========================================
+ Coverage 91.09% 91.28% +0.19%
==========================================
Files 26 26
Lines 4470 4476 +6
==========================================
+ Hits 4072 4086 +14
+ Misses 398 390 -8
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
| return pytz.timezone(tzenv) | ||
| except pytz.UnknownTimeZoneError: | ||
| pass | ||
| else: |
There was a problem hiding this comment.
as zoneinfo may be None, should we check for that here?
Member
Author
There was a problem hiding this comment.
pytz is a required dep when Python < 3.9; zoneinfo should be available >= 3.9...
|
Looks good to me. |
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.
Fixes #1092.
When
pytzis not installed, importingbabel.localtimecould fail (repeatedly) when theTZenvironment variable is malformed enough to be caught by_validate_tzfile_path, which might throw a certainValueError.(When
pytzis installed, it would raise the samepytz.exceptions.UnknownTimeZoneErrorwe already catch and ignore for the same input.)