Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Make pythonjsonlogger import compatible with v2 and v3.1+, and restore get_lang #202

Merged
merged 2 commits into from
Dec 23, 2024
Merged

Make pythonjsonlogger import compatible with v2 and v3.1+, and restore get_lang #202

merged 2 commits into from
Dec 23, 2024

Conversation

samuelhwilliams
Copy link
Contributor

@samuelhwilliams samuelhwilliams commented Dec 23, 2024 •
edited
Loading

Two faulty changes here:

  • The import change from pythonjsonlogger requires python-json-logger 3.1+, but most of the apps are still on v2.
  • pre-award-stores still needs get_lang for locale stuff, so adding that back temporarily

@samuelhwilliams samuelhwilliams force-pushed the bau/fix-json-logger branch 2 times, most recently from 2fd4178 to f9e0f6a Compare December 23, 2024 12:04
hamzabinkhalid
hamzabinkhalid previously approved these changes Dec 23, 2024
View reviewed changes
@samuelhwilliams
Fix pythonjsonlogger deprecation warning
e51c2d9 
Depending on what version of python-json-logger is installed, the
JsonFormatter is in a different module.

This change fixes the broken PR
#200
which didn't account for apps still using python-json-logger v2.
@samuelhwilliams
Revert "Remove locale selector/translation support"
f0d99c5 
This reverts commit ea29db1.
github-advanced-security[bot]
github-advanced-security bot found potential problems Dec 23, 2024
View reviewed changes
fsd_utils/locale_selector/set_lang.py Dismissed Show dismissed Hide dismissed
fsd_utils/locale_selector/set_lang.py Dismissed Show dismissed Hide dismissed
@samuelhwilliams samuelhwilliams changed the title Revert pythonjsonlogger import change Revert faulty changes to pythonjsonlogger import and get_lang Dec 23, 2024
@samuelhwilliams samuelhwilliams changed the title Revert faulty changes to pythonjsonlogger import and get_lang Make pythonjsonlogger import compatible with v2 and v3.1+, and restore get_lang Dec 23, 2024
@samuelhwilliams samuelhwilliams merged commit 6a7c71a into main Dec 23, 2024
8 checks passed
@samuelhwilliams samuelhwilliams deleted the bau/fix-json-logger branch December 23, 2024 12:25
@samuelhwilliams samuelhwilliams mentioned this pull request Dec 23, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hamzabinkhalid hamzabinkhalid hamzabinkhalid approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@samuelhwilliams @hamzabinkhalid