Skip to content

Commit b559a79

Browse files
CitoCito
committed
Reformat with newer black version
1 parent c6360e8 commit b559a79

19 files changed

+145
-113
lines changed

‎src/graphql/language/parser.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -346,9 +346,11 @@ def parse_variable_definition(self) -> VariableDefinitionNode:
346346
return VariableDefinitionNode(
347347
variable=self.parse_variable(),
348348
type=self.expect_token(TokenKind.COLON) and self.parse_type_reference(),
349-
default_value=self.parse_const_value_literal()
350-
if self.expect_optional_token(TokenKind.EQUALS)
351-
else None,
349+
default_value=(
350+
self.parse_const_value_literal()
351+
if self.expect_optional_token(TokenKind.EQUALS)
352+
else None
353+
),
352354
directives=self.parse_const_directives(),
353355
loc=self.loc(start),
354356
)
@@ -390,9 +392,9 @@ def parse_field(self) -> FieldNode:
390392
name=name,
391393
arguments=self.parse_arguments(False),
392394
directives=self.parse_directives(False),
393-
selection_set=self.parse_selection_set()
394-
if self.peek(TokenKind.BRACE_L)
395-
else None,
395+
selection_set=(
396+
self.parse_selection_set() if self.peek(TokenKind.BRACE_L) else None
397+
),
396398
loc=self.loc(start),
397399
)
398400

‎src/graphql/language/predicates.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ def is_const_value_node(node: Node) -> bool:
5353
return is_value_node(node) and (
5454
any(is_const_value_node(value) for value in node.values)
5555
if isinstance(node, ListValueNode)
56-
else any(is_const_value_node(field.value) for field in node.fields)
57-
if isinstance(node, ObjectValueNode)
58-
else not isinstance(node, VariableNode)
56+
else (
57+
any(is_const_value_node(field.value) for field in node.fields)
58+
if isinstance(node, ObjectValueNode)
59+
else not isinstance(node, VariableNode)
60+
)
5961
)
6062

6163

‎src/graphql/language/print_location.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,11 @@ def print_source_location(source: Source, source_location: SourceLocation) -> st
4848
("|", "^".rjust(sub_line_column_num)),
4949
(
5050
"|",
51-
sub_lines[sub_line_index + 1]
52-
if sub_line_index < len(sub_lines) - 1
53-
else None,
51+
(
52+
sub_lines[sub_line_index + 1]
53+
if sub_line_index < len(sub_lines) - 1
54+
else None
55+
),
5456
),
5557
)
5658

‎src/graphql/pyutils/inspect.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@ def inspect_recursive(value: Any, seen_values: List) -> str:
6262
items = trunc_list(items)
6363
if isinstance(value, dict):
6464
s = ", ".join(
65-
"..."
66-
if v is ELLIPSIS
67-
else inspect_recursive(v[0], seen_values)
68-
+ ": "
69-
+ inspect_recursive(v[1], seen_values)
65+
(
66+
"..."
67+
if v is ELLIPSIS
68+
else inspect_recursive(v[0], seen_values)
69+
+ ": "
70+
+ inspect_recursive(v[1], seen_values)
71+
)
7072
for v in items
7173
)
7274
else:

‎src/graphql/type/definition.py

Lines changed: 47 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -438,16 +438,22 @@ def to_kwargs(self) -> GraphQLScalarTypeKwargs:
438438
# noinspection PyArgumentList
439439
return GraphQLScalarTypeKwargs( # type: ignore
440440
super().to_kwargs(),
441-
serialize=None
442-
if self.serialize is GraphQLScalarType.serialize
443-
else self.serialize,
444-
parse_value=None
445-
if self.parse_value is GraphQLScalarType.parse_value
446-
else self.parse_value,
447-
parse_literal=None
448-
if getattr(self.parse_literal, "__func__", None)
449-
is GraphQLScalarType.parse_literal
450-
else self.parse_literal,
441+
serialize=(
442+
None
443+
if self.serialize is GraphQLScalarType.serialize
444+
else self.serialize
445+
),
446+
parse_value=(
447+
None
448+
if self.parse_value is GraphQLScalarType.parse_value
449+
else self.parse_value
450+
),
451+
parse_literal=(
452+
None
453+
if getattr(self.parse_literal, "__func__", None)
454+
is GraphQLScalarType.parse_literal
455+
else self.parse_literal
456+
),
451457
specified_by_url=self.specified_by_url,
452458
)
453459

@@ -517,9 +523,11 @@ def __init__(
517523
)
518524
else:
519525
args = {
520-
assert_name(name): value
521-
if isinstance(value, GraphQLArgument)
522-
else GraphQLArgument(cast(GraphQLInputType, value))
526+
assert_name(name): (
527+
value
528+
if isinstance(value, GraphQLArgument)
529+
else GraphQLArgument(cast(GraphQLInputType, value))
530+
)
523531
for name, value in args.items()
524532
}
525533
if resolve is not None and not callable(resolve):
@@ -824,9 +832,9 @@ def fields(self) -> GraphQLFieldMap:
824832
f"{self.name} fields must be GraphQLField or output type objects."
825833
)
826834
return {
827-
assert_name(name): value
828-
if isinstance(value, GraphQLField)
829-
else GraphQLField(value) # type: ignore
835+
assert_name(name): (
836+
value if isinstance(value, GraphQLField) else GraphQLField(value)
837+
) # type: ignore
830838
for name, value in fields.items()
831839
}
832840

@@ -958,9 +966,9 @@ def fields(self) -> GraphQLFieldMap:
958966
f"{self.name} fields must be GraphQLField or output type objects."
959967
)
960968
return {
961-
assert_name(name): value
962-
if isinstance(value, GraphQLField)
963-
else GraphQLField(value) # type: ignore
969+
assert_name(name): (
970+
value if isinstance(value, GraphQLField) else GraphQLField(value)
971+
) # type: ignore
964972
for name, value in fields.items()
965973
}
966974

@@ -1181,9 +1189,11 @@ def __init__(
11811189
elif names_as_values is True:
11821190
values = {key: key for key in values}
11831191
values = {
1184-
assert_enum_value_name(key): value
1185-
if isinstance(value, GraphQLEnumValue)
1186-
else GraphQLEnumValue(value)
1192+
assert_enum_value_name(key): (
1193+
value
1194+
if isinstance(value, GraphQLEnumValue)
1195+
else GraphQLEnumValue(value)
1196+
)
11871197
for key, value in values.items()
11881198
}
11891199
if ast_node and not isinstance(ast_node, EnumTypeDefinitionNode):
@@ -1441,9 +1451,11 @@ def to_kwargs(self) -> GraphQLInputObjectTypeKwargs:
14411451
return GraphQLInputObjectTypeKwargs( # type: ignore
14421452
super().to_kwargs(),
14431453
fields=self.fields.copy(),
1444-
out_type=None
1445-
if self.out_type is GraphQLInputObjectType.out_type
1446-
else self.out_type,
1454+
out_type=(
1455+
None
1456+
if self.out_type is GraphQLInputObjectType.out_type
1457+
else self.out_type
1458+
),
14471459
)
14481460

14491461
def __copy__(self) -> "GraphQLInputObjectType": # pragma: no cover
@@ -1473,9 +1485,11 @@ def fields(self) -> GraphQLInputFieldMap:
14731485
" GraphQLInputField or input type objects."
14741486
)
14751487
return {
1476-
assert_name(name): value
1477-
if isinstance(value, GraphQLInputField)
1478-
else GraphQLInputField(value) # type: ignore
1488+
assert_name(name): (
1489+
value
1490+
if isinstance(value, GraphQLInputField)
1491+
else GraphQLInputField(value)
1492+
) # type: ignore
14791493
for name, value in fields.items()
14801494
}
14811495

@@ -1695,18 +1709,15 @@ def assert_nullable_type(type_: Any) -> GraphQLNullableType:
16951709

16961710

16971711
@overload
1698-
def get_nullable_type(type_: None) -> None:
1699-
...
1712+
def get_nullable_type(type_: None) -> None: ...
17001713

17011714

17021715
@overload
1703-
def get_nullable_type(type_: GraphQLNullableType) -> GraphQLNullableType:
1704-
...
1716+
def get_nullable_type(type_: GraphQLNullableType) -> GraphQLNullableType: ...
17051717

17061718

17071719
@overload
1708-
def get_nullable_type(type_: GraphQLNonNull) -> GraphQLNullableType:
1709-
...
1720+
def get_nullable_type(type_: GraphQLNonNull) -> GraphQLNullableType: ...
17101721

17111722

17121723
def get_nullable_type(
@@ -1798,13 +1809,11 @@ def assert_named_type(type_: Any) -> GraphQLNamedType:
17981809

17991810

18001811
@overload
1801-
def get_named_type(type_: None) -> None:
1802-
...
1812+
def get_named_type(type_: None) -> None: ...
18031813

18041814

18051815
@overload
1806-
def get_named_type(type_: GraphQLType) -> GraphQLNamedType:
1807-
...
1816+
def get_named_type(type_: GraphQLType) -> GraphQLNamedType: ...
18081817

18091818

18101819
def get_named_type(type_: Optional[GraphQLType]) -> Optional[GraphQLNamedType]:

‎src/graphql/type/directives.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,11 @@ def __init__(
6565
assert_name(name)
6666
try:
6767
locations = tuple(
68-
value
69-
if isinstance(value, DirectiveLocation)
70-
else DirectiveLocation[cast(str, value)]
68+
(
69+
value
70+
if isinstance(value, DirectiveLocation)
71+
else DirectiveLocation[cast(str, value)]
72+
)
7173
for value in locations
7274
)
7375
except (KeyError, TypeError):
@@ -90,9 +92,11 @@ def __init__(
9092
)
9193
else:
9294
args = {
93-
assert_name(name): value
94-
if isinstance(value, GraphQLArgument)
95-
else GraphQLArgument(cast(GraphQLInputType, value))
95+
assert_name(name): (
96+
value
97+
if isinstance(value, GraphQLArgument)
98+
else GraphQLArgument(cast(GraphQLInputType, value))
99+
)
96100
for name, value in args.items()
97101
}
98102
if not isinstance(is_repeatable, bool):

‎src/graphql/type/schema.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,9 +270,9 @@ def __init__(
270270
if iface.name in implementations_map:
271271
implementations = implementations_map[iface.name]
272272
else:
273-
implementations = implementations_map[
274-
iface.name
275-
] = InterfaceImplementations(objects=[], interfaces=[])
273+
implementations = implementations_map[iface.name] = (
274+
InterfaceImplementations(objects=[], interfaces=[])
275+
)
276276

277277
implementations.interfaces.append(named_type)
278278
elif is_object_type(named_type):
@@ -284,9 +284,9 @@ def __init__(
284284
if iface.name in implementations_map:
285285
implementations = implementations_map[iface.name]
286286
else:
287-
implementations = implementations_map[
288-
iface.name
289-
] = InterfaceImplementations(objects=[], interfaces=[])
287+
implementations = implementations_map[iface.name] = (
288+
InterfaceImplementations(objects=[], interfaces=[])
289+
)
290290

291291
implementations.objects.append(named_type)
292292

‎src/graphql/type/validate.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -408,11 +408,13 @@ def validate_type_implements_ancestors(
408408
for transitive in iface_interfaces:
409409
if transitive not in type_interfaces:
410410
self.report_error(
411-
f"Type {type_.name} cannot implement {iface.name}"
412-
" because it would create a circular reference."
413-
if transitive is type_
414-
else f"Type {type_.name} must implement {transitive.name}"
415-
f" because it is implemented by {iface.name}.",
411+
(
412+
f"Type {type_.name} cannot implement {iface.name}"
413+
" because it would create a circular reference."
414+
if transitive is type_
415+
else f"Type {type_.name} must implement {transitive.name}"
416+
f" because it is implemented by {iface.name}."
417+
),
416418
get_all_implements_interface_nodes(iface, transitive)
417419
+ get_all_implements_interface_nodes(type_, iface),
418420
)

‎src/graphql/utilities/ast_to_dict.py

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,23 @@
1010
@overload
1111
def ast_to_dict(
1212
node: Node, locations: bool = False, cache: Optional[Dict[Node, Any]] = None
13-
) -> Dict:
14-
...
13+
) -> Dict: ...
1514

1615

1716
@overload
1817
def ast_to_dict(
1918
node: Collection[Node],
2019
locations: bool = False,
2120
cache: Optional[Dict[Node, Any]] = None,
22-
) -> List[Node]:
23-
...
21+
) -> List[Node]: ...
2422

2523

2624
@overload
2725
def ast_to_dict(
2826
node: OperationType,
2927
locations: bool = False,
3028
cache: Optional[Dict[Node, Any]] = None,
31-
) -> str:
32-
...
29+
) -> str: ...
3330

3431

3532
def ast_to_dict(

‎src/graphql/utilities/extend_schema.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,9 +661,11 @@ def build_type(ast_node: TypeDefinitionNode) -> GraphQLNamedType:
661661
replace_directive(directive) for directive in schema_kwargs["directives"]
662662
)
663663
+ tuple(build_directive(directive) for directive in directive_defs),
664-
description=schema_def.description.value
665-
if schema_def and schema_def.description
666-
else None,
664+
description=(
665+
schema_def.description.value
666+
if schema_def and schema_def.description
667+
else None
668+
),
667669
extensions={},
668670
ast_node=schema_def or schema_kwargs["ast_node"],
669671
extension_ast_nodes=schema_kwargs["extension_ast_nodes"]

‎src/graphql/utilities/find_breaking_changes.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def find_directive_changes(
134134
)
135135
)
136136

137-
for (old_directive, new_directive) in directives_diff.persisted:
137+
for old_directive, new_directive in directives_diff.persisted:
138138
args_diff = dict_diff(old_directive.args, new_directive.args)
139139

140140
for arg_name, new_arg in args_diff.added.items():
@@ -185,10 +185,12 @@ def find_type_changes(
185185
schema_changes.append(
186186
BreakingChange(
187187
BreakingChangeType.TYPE_REMOVED,
188-
f"Standard scalar {type_name} was removed"
189-
" because it is not referenced anymore."
190-
if is_specified_scalar_type(old_type)
191-
else f"{type_name} was removed.",
188+
(
189+
f"Standard scalar {type_name} was removed"
190+
" because it is not referenced anymore."
191+
if is_specified_scalar_type(old_type)
192+
else f"{type_name} was removed."
193+
),
192194
)
193195
)
194196

0 commit comments

Comments
 (0)