From c2437e7fa0666e0981f9b1fda029c8501e9b78ff Mon Sep 17 00:00:00 2001 From: MeGaGiGaGon <107241144+megagigagon@users.noreply.github.com> Date: Tue, 22 Oct 2024 16:42:22 -0700 Subject: [PATCH] Changelog and docs updates --- CHANGES.md | 2 ++ docs/the_black_code_style/future_style.md | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index e2cc70f1661..c68c3cf7ffd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,8 @@ +- Fix/remove string merging changing f-string quotes (#4498) + ### Configuration diff --git a/docs/the_black_code_style/future_style.md b/docs/the_black_code_style/future_style.md index cd4fb12bd51..309cbfe455c 100644 --- a/docs/the_black_code_style/future_style.md +++ b/docs/the_black_code_style/future_style.md @@ -132,10 +132,11 @@ foo( _Black_ will split long string literals and merge short ones. Parentheses are used where appropriate. When split, parts of f-strings that don't need formatting are converted to -plain strings. User-made splits are respected when they do not exceed the line length -limit. Line continuation backslashes are converted into parenthesized strings. -Unnecessary parentheses are stripped. The stability and status of this feature is -tracked in [this issue](https://github.com/psf/black/issues/2188). +plain strings. f-strings will not be merged if it would change their quotation mark +style. User-made splits are respected when they do not exceed the line length limit. +Line continuation backslashes are converted into parenthesized strings. Unnecessary +parentheses are stripped. The stability and status of this feature istracked in +[this issue](https://github.com/psf/black/issues/2188). (labels/wrap-long-dict-values)=