mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-11-02 04:48:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update formatter fixtures (#8935)

Browse source 
I merged a branch that wasn't up-to-date, which left us with test
failures on `main`.
This commit is contained in:
Charlie Marsh 2023-11-30 21:57:05 -05:00 • committed by GitHub
parent eaa310429f
commit b2638c62a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 330 additions and 587 deletions
Download patch file Download diff file Expand all files Collapse all files

790
crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_hug_parens_with_braces_and_square_brackets.py.snap
View file

@ -197,94 +197,7 @@ for foo in ["a", "b"]:
```diff ```diff
--- Black --- Black
+++ Ruff +++ Ruff
@@ -1,43 +1,55 @@ @@ -47,17 +47,21 @@
def foo_brackets(request):
- return JsonResponse({
- "var_1": foo,
- "var_2": bar,
- })
+ return JsonResponse(
+ {
+ "var_1": foo,
+ "var_2": bar,
+ }
+ )
def foo_square_brackets(request):
- return JsonResponse([
- "var_1",
- "var_2",
- ])
+ return JsonResponse(
+ [
+ "var_1",
+ "var_2",
+ ]
+ )
-func({
- "a": 37,
- "b": 42,
- "c": 927,
- "aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
-})
+func(
+ {
+ "a": 37,
+ "b": 42,
+ "c": 927,
+ "aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
+ }
+)
-func([
- "random_string_number_one",
- "random_string_number_two",
- "random_string_number_three",
- "random_string_number_four",
-])
+func(
+ [
+ "random_string_number_one",
+ "random_string_number_two",
+ "random_string_number_three",
+ "random_string_number_four",
+ ]
+)
-func({
- # expand me
- "a": 37,
- "b": 42,
- "c": 927,
-})
+func(
+ {
+ # expand me
+ "a": 37,
+ "b": 42,
+ "c": 927,
+ }
+)
-func([
- "a",
- "b",
- "c",
-])
+func(
+ [
+ "a",
+ "b",
+ "c",
+ ]
+)
func(
[
@@ -47,17 +59,21 @@
], ],
) )
@ -316,67 +229,9 @@ for foo in ["a", "b"]:
func( func(
# preserve me # preserve me
@@ -68,38 +84,48 @@ @@ -95,11 +99,13 @@
] # preserve me but hug brackets
) ])
-func([ # preserve me but hug brackets
- "c",
- "d",
- "e",
-])
+func(
+ [ # preserve me but hug brackets
+ "c",
+ "d",
+ "e",
+ ]
+)
-func([
- # preserve me but hug brackets
- "c",
- "d",
- "e",
-])
+func(
+ [
+ # preserve me but hug brackets
+ "c",
+ "d",
+ "e",
+ ]
+)
-func([
- "c",
- # preserve me but hug brackets
- "d",
- "e",
-])
+func(
+ [
+ "c",
+ # preserve me but hug brackets
+ "d",
+ "e",
+ ]
+)
-func([
- "c",
- "d",
- "e",
- # preserve me but hug brackets
-])
+func(
+ [
+ "c",
+ "d",
+ "e",
+ # preserve me but hug brackets
+ ]
+)
-func([ -func([
- "c", - "c",
@ -393,33 +248,24 @@ for foo in ["a", "b"]:
func( func(
[ [
@@ -114,50 +140,68 @@ @@ -111,10 +117,10 @@
func(
[x for x in "long line long line long line long line long line long line long line"]
) )
-func([
- x
- for x in [
+func(
+ [
x
- for x in "long line long line long line long line long line long line long line"
+ for x in [
+ x
+ for x in "long line long line long line long line long line long line long line"
+ ]
]
-])
+)
func({"short line"}) func([x for x in "short line"])
-func({ -func(
- "long line", - [x for x in "long line long line long line long line long line long line long line"]
- "long long line", -)
- "long long long line", func([
- "long long long long line", + x for x in "long line long line long line long line long line long line long line"
- "long long long long long line", +])
-}) +func([
x
for x in [
x
@@ -130,13 +136,15 @@
"long long long long line",
"long long long long long line",
})
-func({{ -func({{
- "long line", - "long line",
- "long long line", - "long long line",
@ -427,20 +273,22 @@ for foo in ["a", "b"]:
- "long long long long line", - "long long long long line",
- "long long long long long line", - "long long long long long line",
-}}) -}})
-func(( +func({
- "long line", + {
- "long long line", + "long line",
- "long long long line", + "long long line",
- "long long long long line", + "long long long line",
- "long long long long long line", + "long long long long line",
-)) + "long long long long long line",
-func((( + }
- "long line", +})
- "long long line", func((
- "long long long line", "long line",
- "long long long long line", "long long line",
- "long long long long long line", @@ -151,30 +159,62 @@
-))) "long long long long line",
"long long long long long line",
)))
-func([[ -func([[
- "long line", - "long line",
- "long long line", - "long long line",
@ -448,61 +296,81 @@ for foo in ["a", "b"]:
- "long long long long line", - "long long long long line",
- "long long long long long line", - "long long long long long line",
-]]) -]])
+func( +func([
+ {
+ "long line",
+ "long long line",
+ "long long long line",
+ "long long long long line",
+ "long long long long long line",
+ }
+)
+func(
+ {
+ {
+ "long line",
+ "long long line",
+ "long long long line",
+ "long long long long line",
+ "long long long long long line",
+ }
+ }
+)
+func(
+ (
+ "long line",
+ "long long line",
+ "long long long line",
+ "long long long long line",
+ "long long long long long line",
+ )
+)
+func(
+ (
+ (
+ "long line",
+ "long long line",
+ "long long long line",
+ "long long long long line",
+ "long long long long long line",
+ )
+ )
+)
+func(
+ [ + [
+ [ + "long line",
+ "long line", + "long long line",
+ "long long line", + "long long long line",
+ "long long long line", + "long long long long line",
+ "long long long long line", + "long long long long long line",
+ "long long long long long line",
+ ]
+ ] + ]
+) +])
# Do not hug if the argument fits on a single line. # Do not hug if the argument fits on a single line.
func( -func(
@@ -194,18 +238,24 @@ - {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
-)
-func(
- ("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line")
-)
-func(
- ["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"]
-)
-func(
- **{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"}
-)
-func(
- *("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----")
-)
+func({
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+})
+func((
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+))
+func([
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+])
+func(**{
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit---",
+})
+func(*(
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit line",
+ "fit----",
+))
array = [
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
]
@@ -194,18 +234,24 @@
) )
nested_mapping = { nested_mapping = {
@ -538,148 +406,64 @@ for foo in ["a", "b"]:
explicit_exploding = [ explicit_exploding = [
[ [
[ [
@@ -214,30 +264,42 @@ @@ -240,9 +286,9 @@
], })
],
]
-single_item_do_not_explode = Context({
- "version": get_docs_version(),
-})
+single_item_do_not_explode = Context(
+ {
+ "version": get_docs_version(),
+ }
+)
-foo(*[
- "long long long long long line",
- "long long long long long line",
- "long long long long long line",
-])
+foo(
+ *[
+ "long long long long long line",
+ "long long long long long line",
+ "long long long long long line",
+ ]
+)
-foo(*[
- str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)
-])
+foo(
+ *[
+ str(i)
+ for i in range(100000000000000000000000000000000000000000000000000000000000)
+ ]
+)
-foo(**{
- "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
- "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
- "ccccccccccccccccccccccccccccccccc": 3,
- **other,
-})
+foo(
+ **{
+ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
+ "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
+ "ccccccccccccccccccccccccccccccccc": 3,
+ **other,
+ }
+)
-foo(**{
- x: y for x, y in enumerate(["long long long long line", "long long long long line"])
-})
+foo(
+ **{
+ x: y
+ for x, y in enumerate(["long long long long line", "long long long long line"])
+ }
+)
# Edge case when deciding whether to hug the brackets without inner content. # Edge case when deciding whether to hug the brackets without inner content.
very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName( -very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName(
@@ -245,11 +307,13 @@ - [[]]
) -)
+very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName([
+ []
+])
for foo in ["a", "b"]: for foo in ["a", "b"]:
- output.extend([ output.extend([
- individual
- for
- # Foobar
- container in xs_by_y[foo]
- # Foobar
- for individual in container["nested"]
- ])
+ output.extend(
+ [
+ individual
+ for
+ # Foobar
+ container in xs_by_y[foo]
+ # Foobar
+ for individual in container["nested"]
+ ]
+ )
``` ```
## Ruff Output ## Ruff Output
```python ```python
def foo_brackets(request): def foo_brackets(request):
return JsonResponse( return JsonResponse({
{ "var_1": foo,
"var_1": foo, "var_2": bar,
"var_2": bar, })
}
)
def foo_square_brackets(request): def foo_square_brackets(request):
return JsonResponse( return JsonResponse([
[ "var_1",
"var_1", "var_2",
"var_2", ])
]
)
func( func({
{ "a": 37,
"a": 37, "b": 42,
"b": 42, "c": 927,
"c": 927, "aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111,
"aaaaaaaaaaaaaaaaaaaaaaaaa": 11111111111111111111111111111111111111111, })
}
)
func( func([
[ "random_string_number_one",
"random_string_number_one", "random_string_number_two",
"random_string_number_two", "random_string_number_three",
"random_string_number_three", "random_string_number_four",
"random_string_number_four", ])
]
)
func( func({
{ # expand me
# expand me "a": 37,
"a": 37, "b": 42,
"b": 42, "c": 927,
"c": 927, })
}
)
func( func([
[ "a",
"a", "b",
"b", "c",
"c", ])
]
)
func( func(
[ [
@ -714,40 +498,32 @@ func(
] ]
) )
func( func([ # preserve me but hug brackets
[ # preserve me but hug brackets "c",
"c", "d",
"d", "e",
"e", ])
]
)
func( func([
[ # preserve me but hug brackets
# preserve me but hug brackets "c",
"c", "d",
"d", "e",
"e", ])
]
)
func( func([
[ "c",
"c", # preserve me but hug brackets
# preserve me but hug brackets "d",
"d", "e",
"e", ])
]
)
func( func([
[ "c",
"c", "d",
"d", "e",
"e", # preserve me but hug brackets
# preserve me but hug brackets ])
]
)
func( func(
[ [
@ -767,21 +543,26 @@ func(
) )
func([x for x in "short line"]) func([x for x in "short line"])
func( func([
[x for x in "long line long line long line long line long line long line long line"] x for x in "long line long line long line long line long line long line long line"
) ])
func( func([
[ x
for x in [
x x
for x in [ for x in "long line long line long line long line long line long line long line"
x
for x in "long line long line long line long line long line long line long line"
]
] ]
) ])
func({"short line"}) func({"short line"})
func( func({
"long line",
"long long line",
"long long long line",
"long long long long line",
"long long long long long line",
})
func({
{ {
"long line", "long line",
"long long line", "long long line",
@ -789,66 +570,77 @@ func(
"long long long long line", "long long long long line",
"long long long long long line", "long long long long long line",
} }
) })
func( func((
{ "long line",
{ "long long line",
"long line", "long long long line",
"long long line", "long long long long line",
"long long long line", "long long long long long line",
"long long long long line", ))
"long long long long long line", func(((
} "long line",
} "long long line",
) "long long long line",
func( "long long long long line",
( "long long long long long line",
"long line", )))
"long long line", func([
"long long long line",
"long long long long line",
"long long long long long line",
)
)
func(
(
(
"long line",
"long long line",
"long long long line",
"long long long long line",
"long long long long long line",
)
)
)
func(
[ [
[ "long line",
"long line", "long long line",
"long long line", "long long long line",
"long long long line", "long long long long line",
"long long long long line", "long long long long long line",
"long long long long long line",
]
] ]
) ])
# Do not hug if the argument fits on a single line. # Do not hug if the argument fits on a single line.
func( func({
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"} "fit line",
) "fit line",
func( "fit line",
("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line") "fit line",
) "fit line",
func( "fit line",
["fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"] "fit line",
) })
func( func((
**{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit---"} "fit line",
) "fit line",
func( "fit line",
*("fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit----") "fit line",
) "fit line",
"fit line",
"fit line",
))
func([
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
])
func(**{
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit---",
})
func(*(
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit line",
"fit----",
))
array = [ array = [
{"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"} {"fit line", "fit line", "fit line", "fit line", "fit line", "fit line", "fit line"}
] ]
@ -894,59 +686,45 @@ explicit_exploding = [
], ],
], ],
] ]
single_item_do_not_explode = Context( single_item_do_not_explode = Context({
{ "version": get_docs_version(),
"version": get_docs_version(), })
}
)
foo( foo(*[
*[ "long long long long long line",
"long long long long long line", "long long long long long line",
"long long long long long line", "long long long long long line",
"long long long long long line", ])
]
)
foo( foo(*[
*[ str(i) for i in range(100000000000000000000000000000000000000000000000000000000000)
str(i) ])
for i in range(100000000000000000000000000000000000000000000000000000000000)
]
)
foo( foo(**{
**{ "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1,
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa": 1, "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2,
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb": 2, "ccccccccccccccccccccccccccccccccc": 3,
"ccccccccccccccccccccccccccccccccc": 3, **other,
**other, })
}
)
foo( foo(**{
**{ x: y for x, y in enumerate(["long long long long line", "long long long long line"])
x: y })
for x, y in enumerate(["long long long long line", "long long long long line"])
}
)
# Edge case when deciding whether to hug the brackets without inner content. # Edge case when deciding whether to hug the brackets without inner content.
very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName( very_very_very_long_variable = very_very_very_long_module.VeryVeryVeryVeryLongClassName([
[[]] []
) ])
for foo in ["a", "b"]: for foo in ["a", "b"]:
output.extend( output.extend([
[ individual
individual for
for # Foobar
# Foobar container in xs_by_y[foo]
container in xs_by_y[foo] # Foobar
# Foobar for individual in container["nested"]
for individual in container["nested"] ])
]
)
``` ```
## Black Output ## Black Output

127
crates/ruff_python_formatter/tests/snapshots/black_compatibility@cases__preview_long_strings__regression.py.snap
View file

@ -573,7 +573,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
```diff ```diff
--- Black --- Black
+++ Ruff +++ Ruff
@@ -25,41 +25,42 @@ @@ -25,20 +25,17 @@
"Jaguar", "Jaguar",
) )
@ -599,27 +599,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
class A: @@ -57,9 +54,11 @@
def foo():
- XXXXXXXXXXXX.append((
- "xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
- xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
- ),
- my_var,
- my_other_var,
- ))
+ XXXXXXXXXXXX.append(
+ (
+ "xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
+ xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
+ ),
+ my_var,
+ my_other_var,
+ )
+ )
class A:
class B: class B:
def foo(): def foo():
bar( bar(
@ -634,7 +614,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
), ),
varX, varX,
varY, varY,
@@ -70,9 +71,10 @@ @@ -70,9 +69,10 @@
def foo(xxxx): def foo(xxxx):
for xxx_xxxx, _xxx_xxx, _xxx_xxxxx, xxx_xxxx in xxxx: for xxx_xxxx, _xxx_xxx, _xxx_xxxxx, xxx_xxxx in xxxx:
for xxx in xxx_xxxx: for xxx in xxx_xxxx:
@ -648,7 +628,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
@@ -80,10 +82,11 @@ @@ -80,10 +80,11 @@
def disappearing_comment(): def disappearing_comment():
return ( return (
( # xx -x xxxxxxx xx xxx xxxxxxx. ( # xx -x xxxxxxx xx xxx xxxxxxx.
@ -662,7 +642,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
"--xxxxxxx --xxxxxx=x --xxxxxx-xxxxx=xxxxxx" "--xxxxxxx --xxxxxx=x --xxxxxx-xxxxx=xxxxxx"
" --xxxxxx-xxxx=xxxxxxxxxxx.xxx" " --xxxxxx-xxxx=xxxxxxxxxxx.xxx"
) )
@@ -113,18 +116,25 @@ @@ -113,18 +114,25 @@
func_call_where_string_arg_has_method_call_and_bad_parens( func_call_where_string_arg_has_method_call_and_bad_parens(
@ -694,7 +674,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
@@ -132,52 +142,60 @@ @@ -132,52 +140,60 @@
def append(self): def append(self):
if True: if True:
xxxx.xxxxxxx.xxxxx( xxxx.xxxxxxx.xxxxx(
@ -788,7 +768,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
} }
@@ -185,10 +203,10 @@ @@ -185,10 +201,10 @@
def foo(self): def foo(self):
if True: if True:
xxxxx_xxxxxxxxxxxx( xxxxx_xxxxxxxxxxxx(
@ -803,7 +783,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
@@ -232,39 +250,24 @@ @@ -232,39 +248,24 @@
some_dictionary = { some_dictionary = {
"xxxxx006": [ "xxxxx006": [
@ -852,7 +832,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
some_commented_string = ( # This comment stays at the top. some_commented_string = ( # This comment stays at the top.
"This string is long but not so long that it needs hahahah toooooo be so greatttt" "This string is long but not so long that it needs hahahah toooooo be so greatttt"
@@ -279,36 +282,25 @@ @@ -279,38 +280,27 @@
) )
lpar_and_rpar_have_comments = func_call( # LPAR Comment lpar_and_rpar_have_comments = func_call( # LPAR Comment
@ -892,12 +872,14 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
- f" certainly, absolutely {does}." - f" certainly, absolutely {does}."
+ f"We have to remember to escape {braces}." " Like {these}." f" But not {this}." + f"We have to remember to escape {braces}." " Like {these}." f" But not {this}."
) )
-
-fstring = f"We have to remember to escape {braces}. Like {{these}}. But not {this}." -fstring = f"We have to remember to escape {braces}. Like {{these}}. But not {this}."
-
class A: class A:
@@ -364,10 +356,7 @@ class B:
def foo():
@@ -364,10 +354,7 @@
def foo(): def foo():
if not hasattr(module, name): if not hasattr(module, name):
raise ValueError( raise ValueError(
@ -909,7 +891,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
% (name, module_name, get_docs_version()) % (name, module_name, get_docs_version())
) )
@@ -382,35 +371,33 @@ @@ -382,23 +369,19 @@
class Step(StepBase): class Step(StepBase):
def who(self): def who(self):
@ -931,29 +913,16 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
-xxxxxxx_xxxxxx_xxxxxxx = xxx([ xxxxxxx_xxxxxx_xxxxxxx = xxx([
- xxxxxxxxxxxx( xxxxxxxxxxxx(
- xxxxxx_xxxxxxx=( xxxxxx_xxxxxxx=(
- '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx =' - '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx ='
- ' "xxxxxxxxxxxx")) && ' - ' "xxxxxxxxxxxx")) && '
- # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx. + '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
- "(x.bbbbbbbbbbbb.xxx != " # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
- '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && ' "(x.bbbbbbbbbbbb.xxx != "
+xxxxxxx_xxxxxx_xxxxxxx = xxx( '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
+ [ @@ -409,8 +392,8 @@
+ xxxxxxxxxxxx(
+ xxxxxx_xxxxxxx=(
+ '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
+ # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
+ "(x.bbbbbbbbbbbb.xxx != "
+ '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
+ )
)
- )
-])
+ ]
+)
if __name__ == "__main__": if __name__ == "__main__":
for i in range(4, 8): for i in range(4, 8):
cmd = ( cmd = (
@ -964,7 +933,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
@@ -432,14 +419,12 @@ @@ -432,14 +415,12 @@
assert xxxxxxx_xxxx in [ assert xxxxxxx_xxxx in [
x.xxxxx.xxxxxx.xxxxx.xxxxxx, x.xxxxx.xxxxxx.xxxxx.xxxxxx,
x.xxxxx.xxxxxx.xxxxx.xxxx, x.xxxxx.xxxxxx.xxxxx.xxxx,
@ -983,7 +952,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
RE_ONE_BACKSLASH = { RE_ONE_BACKSLASH = {
"asdf_hjkl_jkl": re.compile( "asdf_hjkl_jkl": re.compile(
@@ -449,8 +434,7 @@ @@ -449,8 +430,7 @@
RE_TWO_BACKSLASHES = { RE_TWO_BACKSLASHES = {
"asdf_hjkl_jkl": re.compile( "asdf_hjkl_jkl": re.compile(
@ -993,7 +962,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
), ),
} }
@@ -462,13 +446,9 @@ @@ -462,13 +442,9 @@
# We do NOT split on f-string expressions. # We do NOT split on f-string expressions.
print( print(
@ -1009,7 +978,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
# The parens should NOT be removed in this case. # The parens should NOT be removed in this case.
( (
@@ -478,8 +458,8 @@ @@ -478,8 +454,8 @@
# The parens should NOT be removed in this case. # The parens should NOT be removed in this case.
( (
@ -1020,7 +989,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
# The parens should NOT be removed in this case. # The parens should NOT be removed in this case.
@@ -518,88 +498,78 @@ @@ -518,88 +494,78 @@
f"<<{author.display_name}>>\n" f"<<{author.display_name}>>\n"
) )
@ -1144,7 +1113,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
"6. Click on Create Credential at the top." "6. Click on Create Credential at the top."
'7. At the top click the link for "API key".' '7. At the top click the link for "API key".'
"8. No application restrictions are needed. Click Create at the bottom." "8. No application restrictions are needed. Click Create at the bottom."
@@ -613,55 +583,40 @@ @@ -613,55 +579,40 @@
f"<<{author.display_name}>>\n" f"<<{author.display_name}>>\n"
) )
@ -1217,7 +1186,7 @@ s = f'Lorem Ipsum is simply dummy text of the printing and typesetting industry:
) )
# Regression test for https://github.com/psf/black/issues/3455. # Regression test for https://github.com/psf/black/issues/3455.
@@ -672,9 +627,11 @@ @@ -672,9 +623,11 @@
} }
# Regression test for https://github.com/psf/black/issues/3506. # Regression test for https://github.com/psf/black/issues/3506.
@ -1281,15 +1250,13 @@ class A:
class A: class A:
def foo(): def foo():
XXXXXXXXXXXX.append( XXXXXXXXXXXX.append((
( "xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format(
"xxx_xxxxxxxxxx(xxxxx={}, xxxx={}, xxxxx, xxxx_xxxx_xxxxxxxxxx={})".format( xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx
xxxxx, xxxx, xxxx_xxxx_xxxxxxxxxx ),
), my_var,
my_var, my_other_var,
my_other_var, ))
)
)
class A: class A:
@ -1620,18 +1587,16 @@ class Step(StepBase):
) )
xxxxxxx_xxxxxx_xxxxxxx = xxx( xxxxxxx_xxxxxx_xxxxxxx = xxx([
[ xxxxxxxxxxxx(
xxxxxxxxxxxx( xxxxxx_xxxxxxx=(
xxxxxx_xxxxxxx=( '((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && '
'((x.aaaaaaaaa = "xxxxxx.xxxxxxxxxxxxxxxxxxxxx") || (x.xxxxxxxxx = "xxxxxxxxxxxx")) && ' # xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx.
# xxxxx xxxxxxxxxxxx xxxx xxx (xxxxxxxxxxxxxxxx) xx x xxxxxxxxx xx xxxxxx. "(x.bbbbbbbbbbbb.xxx != "
"(x.bbbbbbbbbbbb.xxx != " '"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
'"xxx:xxx:xxx::cccccccccccc:xxxxxxx-xxxx/xxxxxxxxxxx/xxxxxxxxxxxxxxxxx") && '
)
) )
] )
) ])
if __name__ == "__main__": if __name__ == "__main__":
for i in range(4, 8): for i in range(4, 8):