Fix for Issue 778. #779
Open
Fix for Issue 778. #779
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
…tegories raise OSError on MacOSX
…ebook.journal.Journal.categories() to use utils.safe_strxfrm in sorting categories instead of locale.strxfrm that was raising OSError in case of characters incompatible with the current locale; added tests.test_journal.py to test the fix for issue-778
jendrikseipp
requested changes
Oct 25, 2024
| @@ -1,3 +1,6 @@ | |||
| # 2.36 (2024-10-24) | |||
There was a problem hiding this comment.
Suggested change
| # 2.36 (2024-10-24) | |
| # 2.36 (unreleased) |
| @@ -1,3 +1,6 @@ | |||
| # 2.36 (2024-10-24) | |||
| * Fix: Categories with characters incompatible with the current locale opens (#778, Oussama Jarrousse). | |||
There was a problem hiding this comment.
Suggested change
| * Fix: Categories with characters incompatible with the current locale opens (#778, Oussama Jarrousse). | |
| * Fix sorting words that are incompatible with the current locale (#778, #779, Oussama Jarrousse). |
| @@ -202,3 +203,14 @@ def flush(self): | |||
| def close(self): | |||
| for stream in self.streams: | |||
| stream.close() | |||
|
|
|||
| def safe_strxfrm(value): | |||
There was a problem hiding this comment.
Suggested change
| def safe_strxfrm(value): | |
| def safe_strxfrm(s: str): |
| return locale.strxfrm(value) | ||
| except OSError: | ||
| return value | ||
| except: |
There was a problem hiding this comment.
Do we really need the bare except? I think it's better to remove it since we have the except for OSError.
|
You can ignore the failing Mac test. But please see that the other tests pass. |
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.
Summary of the changes in this pull request
Pull request checklist
CHANGELOG.mdincluding my name and issue and/or pull request number.TODO.md.