788268bc39
- when a trailing comma is specified in any bracket pair, that signals to Black that this bracket pair needs to be always exploded, e.g. presented as "one item per line"; - this causes some changes to previously formatted code that erroneously left trailing commas embedded into single-line expressions; - internally, Black needs to be able to identify trailing commas that it put itself compared to pre-existing trailing commas. We do this by using/abusing lib2to3's `was_checked` attribute. It's True for internally generated trailing commas and False for pre-existing ones (in fact, for all pre-existing leaves and nodes). Fixes #1288
175 lines
3.2 KiB
Python
175 lines
3.2 KiB
Python
import core, time, a
|
|
|
|
from . import A, B, C
|
|
|
|
# keeps existing trailing comma
|
|
from foo import (
|
|
bar,
|
|
)
|
|
|
|
# also keeps existing structure
|
|
from foo import (
|
|
baz,
|
|
qux,
|
|
)
|
|
|
|
# `as` works as well
|
|
from foo import (
|
|
xyzzy as magic,
|
|
)
|
|
|
|
a = {1,2,3,}
|
|
b = {
|
|
1,2,
|
|
3}
|
|
c = {
|
|
1,
|
|
2,
|
|
3,
|
|
}
|
|
x = 1,
|
|
y = narf(),
|
|
nested = {(1,2,3),(4,5,6),}
|
|
nested_no_trailing_comma = {(1,2,3),(4,5,6)}
|
|
nested_long_lines = ["aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", "cccccccccccccccccccccccccccccccccccccccc", (1, 2, 3), "dddddddddddddddddddddddddddddddddddddddd"]
|
|
{"oneple": (1,),}
|
|
{"oneple": (1,)}
|
|
['ls', 'lsoneple/%s' % (foo,)]
|
|
x = {"oneple": (1,)}
|
|
y = {"oneple": (1,),}
|
|
assert False, ("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa wraps %s" % bar)
|
|
|
|
# looping over a 1-tuple should also not get wrapped
|
|
for x in (1,):
|
|
pass
|
|
for (x,) in (1,), (2,), (3,):
|
|
pass
|
|
|
|
[1, 2, 3,]
|
|
|
|
division_result_tuple = (6/2,)
|
|
print("foo %r", (foo.bar,))
|
|
|
|
if True:
|
|
IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
|
|
Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
|
|
| {pylons.controllers.WSGIController}
|
|
)
|
|
|
|
if True:
|
|
ec2client.get_waiter('instance_stopped').wait(
|
|
InstanceIds=[instance.id],
|
|
WaiterConfig={
|
|
'Delay': 5,
|
|
})
|
|
ec2client.get_waiter("instance_stopped").wait(
|
|
InstanceIds=[instance.id],
|
|
WaiterConfig={"Delay": 5,},
|
|
)
|
|
ec2client.get_waiter("instance_stopped").wait(
|
|
InstanceIds=[instance.id], WaiterConfig={"Delay": 5,},
|
|
)
|
|
|
|
# output
|
|
|
|
|
|
import core, time, a
|
|
|
|
from . import A, B, C
|
|
|
|
# keeps existing trailing comma
|
|
from foo import (
|
|
bar,
|
|
)
|
|
|
|
# also keeps existing structure
|
|
from foo import (
|
|
baz,
|
|
qux,
|
|
)
|
|
|
|
# `as` works as well
|
|
from foo import (
|
|
xyzzy as magic,
|
|
)
|
|
|
|
a = {
|
|
1,
|
|
2,
|
|
3,
|
|
}
|
|
b = {1, 2, 3}
|
|
c = {
|
|
1,
|
|
2,
|
|
3,
|
|
}
|
|
x = (1,)
|
|
y = (narf(),)
|
|
nested = {
|
|
(1, 2, 3),
|
|
(4, 5, 6),
|
|
}
|
|
nested_no_trailing_comma = {(1, 2, 3), (4, 5, 6)}
|
|
nested_long_lines = [
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
|
|
"bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
|
|
"cccccccccccccccccccccccccccccccccccccccc",
|
|
(1, 2, 3),
|
|
"dddddddddddddddddddddddddddddddddddddddd",
|
|
]
|
|
{
|
|
"oneple": (1,),
|
|
}
|
|
{"oneple": (1,)}
|
|
["ls", "lsoneple/%s" % (foo,)]
|
|
x = {"oneple": (1,)}
|
|
y = {
|
|
"oneple": (1,),
|
|
}
|
|
assert False, (
|
|
"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa wraps %s"
|
|
% bar
|
|
)
|
|
|
|
# looping over a 1-tuple should also not get wrapped
|
|
for x in (1,):
|
|
pass
|
|
for (x,) in (1,), (2,), (3,):
|
|
pass
|
|
|
|
[
|
|
1,
|
|
2,
|
|
3,
|
|
]
|
|
|
|
division_result_tuple = (6 / 2,)
|
|
print("foo %r", (foo.bar,))
|
|
|
|
if True:
|
|
IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING = (
|
|
Config.IGNORED_TYPES_FOR_ATTRIBUTE_CHECKING
|
|
| {pylons.controllers.WSGIController}
|
|
)
|
|
|
|
if True:
|
|
ec2client.get_waiter("instance_stopped").wait(
|
|
InstanceIds=[instance.id],
|
|
WaiterConfig={
|
|
"Delay": 5,
|
|
},
|
|
)
|
|
ec2client.get_waiter("instance_stopped").wait(
|
|
InstanceIds=[instance.id],
|
|
WaiterConfig={
|
|
"Delay": 5,
|
|
},
|
|
)
|
|
ec2client.get_waiter("instance_stopped").wait(
|
|
InstanceIds=[instance.id],
|
|
WaiterConfig={
|
|
"Delay": 5,
|
|
},
|
|
)
|