Fix backslash carriage return comments #4663
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
Co-authored-by: Jelle Zijlstra <[email protected]>
cobaltt7
approved these changes
Jun 22, 2025
luketainton
pushed a commit
to luketainton/roboluke-tasks
that referenced
this pull request
Sep 19, 2025
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#​4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#​4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#​4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#​4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#​4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#​4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#​4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#​4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#​4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#​4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#​4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#​4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#​4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#​4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#​4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#​4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#​4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#​4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#​4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#​4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#​4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#​4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#​4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#​4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMTYuMTAiLCJ1cGRhdGVkSW5WZXIiOiI0MS4xMTYuMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbInR5cGUvZGVwZW5kZW5jaWVzIl19--> Reviewed-on: https://git.tainton.uk/repos/roboluke/pulls/376 Co-authored-by: Renovate [BOT] <[email protected]> Co-committed-by: Renovate [BOT] <[email protected]>
luketainton
pushed a commit
to luketainton/epage
that referenced
this pull request
Oct 7, 2025
This PR contains the following updates: | Package | Change | Age | Confidence | |---|---|---|---| | [black](https://github.com/psf/black) ([changelog](https://github.com/psf/black/blob/main/CHANGES.md)) | `<25.2.0,>=25.1.0` -> `<25.9.1,>=25.9.0` | [](https://docs.renovatebot.com/merge-confidence/) | [](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>psf/black (black)</summary> ### [`v25.9.0`](https://github.com/psf/black/blob/HEAD/CHANGES.md#2590) [Compare Source](psf/black@25.1.0...25.9.0) ##### Highlights - Remove support for pre-python 3.7 `await/async` as soft keywords/variable names ([#​4676](psf/black#4676)) ##### Stable style - Fix crash while formatting a long `del` statement containing tuples ([#​4628](psf/black#4628)) - Fix crash while formatting expressions using the walrus operator in complex `with` statements ([#​4630](psf/black#4630)) - Handle `# fmt: skip` followed by a comment at the end of file ([#​4635](psf/black#4635)) - Fix crash when a tuple appears in the `as` clause of a `with` statement ([#​4634](psf/black#4634)) - Fix crash when tuple is used as a context manager inside a `with` statement ([#​4646](psf/black#4646)) - Fix crash when formatting a `\` followed by a `\r` followed by a comment ([#​4663](psf/black#4663)) - Fix crash on a `\\r\n` ([#​4673](psf/black#4673)) - Fix crash on `await ...` (where `...` is a literal `Ellipsis`) ([#​4676](psf/black#4676)) - Fix crash on parenthesized expression inside a type parameter bound ([#​4684](psf/black#4684)) - Fix crash when using line ranges excluding indented single line decorated items ([#​4670](psf/black#4670)) ##### Preview style - Fix a bug where one-liner functions/conditionals marked with `# fmt: skip` would still be formatted ([#​4552](psf/black#4552)) - Improve `multiline_string_handling` with ternaries and dictionaries ([#​4657](psf/black#4657)) - Fix a bug where `string_processing` would not split f-strings directly after expressions ([#​4680](psf/black#4680)) - Wrap the `in` clause of comprehensions across lines if necessary ([#​4699](psf/black#4699)) - Remove parentheses around multiple exception types in `except` and `except*` without `as`. ([#​4720](psf/black#4720)) - Add `\r` style newlines to the potential newlines to normalize file newlines both from and to ([#​4710](psf/black#4710)) ##### Parser - Rewrite tokenizer to improve performance and compliance ([#​4536](psf/black#4536)) - Fix bug where certain unusual expressions (e.g., lambdas) were not accepted in type parameter bounds and defaults. ([#​4602](psf/black#4602)) ##### Performance - Avoid using an extra process when running with only one worker ([#​4734](psf/black#4734)) ##### Integrations - Fix the version check in the vim file to reject Python 3.8 ([#​4567](psf/black#4567)) - Enhance GitHub Action `psf/black` to read Black version from an additional section in pyproject.toml: `[project.dependency-groups]` ([#​4606](psf/black#4606)) - Build gallery docker image with python3-slim and reduce image size ([#​4686](psf/black#4686)) ##### Documentation - Add FAQ entry for windows emoji not displaying ([#​4714](psf/black#4714)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR is behind base branch, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS4xMTYuMTAiLCJ1cGRhdGVkSW5WZXIiOiI0MS4xMTYuMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbInR5cGUvZGVwZW5kZW5jaWVzIl19--> Reviewed-on: https://git.tainton.uk/repos/epage/pulls/158 Co-authored-by: Renovate [BOT] <[email protected]> Co-committed-by: Renovate [BOT] <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Description
Fixes a
\followed by a\rfollowed by a comment causing the comment to be deleted. This also fixes Hypothesis failing the CI. This originally went under the radar since the old tokenizer largely didn't support carriage returns, so this example would crash witherror: cannot format <string>: Cannot parse for target version Python 3.13: 1:4: try:\before getting to linegen. The new tokenizer supports carriage returns much better, and so this issue was revealed. I'm not sure why Hypothesis didn't catch this on the original tokenizer switch PR.The fix is very simple, the splitting regex for comment finding only accounted for
\r\nand\n, not a lone\r. This PR adds\ras a valid case to the regex.I added the test case to
test_black.pyinstead of the cases because git would normalize the\rs on checkout, and it's very hard in most editors to deal with\rvs\r\nvs\n. While I was there I also added two of the older\rproblematic examples as tests too.Checklist - did you ...
CHANGES.mdif necessary?