Skip to content

Commit 92197bf

Browse files
redsun82redsun82
committed
Codegen: fix autopep8 pre-commit hook
1 parent 48c2303 commit 92197bf

File tree

5 files changed

+64
-59
lines changed

5 files changed

+64
-59
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ repos:
1919
rev: v1.6.0
2020
hooks:
2121
- id: autopep8
22-
files: ^swift/.*\.py
22+
files: ^misc/codegen/.*\.py
2323

2424
- repo: local
2525
hooks:

‎misc/codegen/lib/schemadefs.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ def modify(self, prop: _schema.Property):
9494
raise _schema.Error(
9595
"list should only be applied to simple or optional property types")
9696

97+
9798
class _Setifier(_schema.PropertyModifier):
9899
def modify(self, prop: _schema.Property):
99100
K = _schema.Property.Kind

‎misc/codegen/test/test_cppgen.py‎

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ def test_empty_class(generate):
4141
assert generate([
4242
schema.Class(name="MyClass"),
4343
]) == [
44-
cpp.Class(name="MyClass", final=True, trap_name="MyClasses")
45-
]
44+
cpp.Class(name="MyClass", final=True, trap_name="MyClasses")
45+
]
4646

4747

4848
def test_two_class_hierarchy(generate):
@@ -51,9 +51,9 @@ def test_two_class_hierarchy(generate):
5151
schema.Class(name="A", derived={"B"}),
5252
schema.Class(name="B", bases=["A"]),
5353
]) == [
54-
base,
55-
cpp.Class(name="B", bases=[base], final=True, trap_name="Bs"),
56-
]
54+
base,
55+
cpp.Class(name="B", bases=[base], final=True, trap_name="Bs"),
56+
]
5757

5858

5959
@pytest.mark.parametrize("type,expected", [
@@ -73,12 +73,12 @@ def test_class_with_field(generate, type, expected, property_cls, optional, repe
7373
assert generate([
7474
schema.Class(name="MyClass", properties=[property_cls("prop", type)]),
7575
]) == [
76-
cpp.Class(name="MyClass",
77-
fields=[cpp.Field("prop", expected, is_optional=optional,
78-
is_repeated=repeated, is_unordered=unordered, trap_name=trap_name)],
79-
trap_name="MyClasses",
80-
final=True)
81-
]
76+
cpp.Class(name="MyClass",
77+
fields=[cpp.Field("prop", expected, is_optional=optional,
78+
is_repeated=repeated, is_unordered=unordered, trap_name=trap_name)],
79+
trap_name="MyClasses",
80+
final=True)
81+
]
8282

8383

8484
def test_class_field_with_null(generate, input):
@@ -91,26 +91,26 @@ def test_class_field_with_null(generate, input):
9191
schema.SingleProperty("y", "B"),
9292
])
9393
]) == [
94-
a,
95-
cpp.Class(name="B", bases=[a], final=True, trap_name="Bs",
96-
fields=[
97-
cpp.Field("x", "TrapLabel<ATag>"),
98-
cpp.Field("y", "TrapLabel<BOrNoneTag>"),
99-
]),
100-
]
94+
a,
95+
cpp.Class(name="B", bases=[a], final=True, trap_name="Bs",
96+
fields=[
97+
cpp.Field("x", "TrapLabel<ATag>"),
98+
cpp.Field("y", "TrapLabel<BOrNoneTag>"),
99+
]),
100+
]
101101

102102

103103
def test_class_with_predicate(generate):
104104
assert generate([
105105
schema.Class(name="MyClass", properties=[
106106
schema.PredicateProperty("prop")]),
107107
]) == [
108-
cpp.Class(name="MyClass",
109-
fields=[
110-
cpp.Field("prop", "bool", trap_name="MyClassProp", is_predicate=True)],
111-
trap_name="MyClasses",
112-
final=True)
113-
]
108+
cpp.Class(name="MyClass",
109+
fields=[
110+
cpp.Field("prop", "bool", trap_name="MyClassProp", is_predicate=True)],
111+
trap_name="MyClasses",
112+
final=True)
113+
]
114114

115115

116116
@pytest.mark.parametrize("name",
@@ -120,23 +120,23 @@ def test_class_with_overridden_unsigned_field(generate, name):
120120
schema.Class(name="MyClass", properties=[
121121
schema.SingleProperty(name, "bar")]),
122122
]) == [
123-
cpp.Class(name="MyClass",
124-
fields=[cpp.Field(name, "unsigned")],
125-
trap_name="MyClasses",
126-
final=True)
127-
]
123+
cpp.Class(name="MyClass",
124+
fields=[cpp.Field(name, "unsigned")],
125+
trap_name="MyClasses",
126+
final=True)
127+
]
128128

129129

130130
def test_class_with_overridden_underscore_field(generate):
131131
assert generate([
132132
schema.Class(name="MyClass", properties=[
133133
schema.SingleProperty("something_", "bar")]),
134134
]) == [
135-
cpp.Class(name="MyClass",
136-
fields=[cpp.Field("something", "bar")],
137-
trap_name="MyClasses",
138-
final=True)
139-
]
135+
cpp.Class(name="MyClass",
136+
fields=[cpp.Field("something", "bar")],
137+
trap_name="MyClasses",
138+
final=True)
139+
]
140140

141141

142142
@pytest.mark.parametrize("name", cpp.cpp_keywords)
@@ -145,11 +145,11 @@ def test_class_with_keyword_field(generate, name):
145145
schema.Class(name="MyClass", properties=[
146146
schema.SingleProperty(name, "bar")]),
147147
]) == [
148-
cpp.Class(name="MyClass",
149-
fields=[cpp.Field(name + "_", "bar")],
150-
trap_name="MyClasses",
151-
final=True)
152-
]
148+
cpp.Class(name="MyClass",
149+
fields=[cpp.Field(name + "_", "bar")],
150+
trap_name="MyClasses",
151+
final=True)
152+
]
153153

154154

155155
def test_classes_with_dirs(generate_grouped):
@@ -161,11 +161,11 @@ def test_classes_with_dirs(generate_grouped):
161161
schema.Class(name="C", bases=["CBase"], group="bar"),
162162
schema.Class(name="D", group="foo/bar/baz"),
163163
]) == {
164-
".": [cpp.Class(name="A", trap_name="As", final=True)],
165-
"foo": [cpp.Class(name="B", trap_name="Bs", final=True)],
166-
"bar": [cbase, cpp.Class(name="C", bases=[cbase], trap_name="Cs", final=True)],
167-
"foo/bar/baz": [cpp.Class(name="D", trap_name="Ds", final=True)],
168-
}
164+
".": [cpp.Class(name="A", trap_name="As", final=True)],
165+
"foo": [cpp.Class(name="B", trap_name="Bs", final=True)],
166+
"bar": [cbase, cpp.Class(name="C", bases=[cbase], trap_name="Cs", final=True)],
167+
"foo/bar/baz": [cpp.Class(name="D", trap_name="Ds", final=True)],
168+
}
169169

170170

171171
def test_cpp_skip_pragma(generate):
@@ -175,10 +175,10 @@ def test_cpp_skip_pragma(generate):
175175
schema.SingleProperty("y", "bar", pragmas=["x", "cpp_skip", "y"]),
176176
])
177177
]) == [
178-
cpp.Class(name="A", final=True, trap_name="As", fields=[
179-
cpp.Field("x", "foo"),
180-
]),
181-
]
178+
cpp.Class(name="A", final=True, trap_name="As", fields=[
179+
cpp.Field("x", "foo"),
180+
]),
181+
]
182182

183183

184184
def test_ipa_classes_ignored(generate):
@@ -199,8 +199,8 @@ def test_ipa_classes_ignored(generate):
199199
name="Z",
200200
),
201201
]) == [
202-
cpp.Class(name="Z", final=True, trap_name="Zs"),
203-
]
202+
cpp.Class(name="Z", final=True, trap_name="Zs"),
203+
]
204204

205205

206206
if __name__ == '__main__':

‎misc/codegen/test/test_ql.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ def test_property_is_a_class(type, expected):
3636
("Whatever", "getAWhatever"),
3737
]
3838

39+
3940
@pytest.mark.parametrize("name,expected_getter", indefinite_getters)
4041
def test_property_indefinite_article(name, expected_getter):
4142
prop = ql.Property(name, plural="X")
@@ -47,6 +48,7 @@ def test_property_unordered_getter(name, expected_getter):
4748
prop = ql.Property(name, plural="X", is_unordered=True)
4849
assert prop.getter == expected_getter
4950

51+
5052
@pytest.mark.parametrize("plural,expected", [
5153
(None, False),
5254
("", False),
@@ -56,6 +58,7 @@ def test_property_is_repeated(plural, expected):
5658
prop = ql.Property("foo", "Foo", "props", ["result"], plural=plural)
5759
assert prop.is_repeated is expected
5860

61+
5962
@pytest.mark.parametrize("plural,unordered,expected", [
6063
(None, False, False),
6164
("", False, False),

‎misc/codegen/test/test_qlgen.py‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -337,21 +337,22 @@ def test_repeated_property(generate_classes, is_child, prev_child):
337337
])),
338338
}
339339

340+
340341
def test_repeated_unordered_property(generate_classes):
341342
assert generate_classes([
342343
schema.Class("FakeRoot"),
343344
schema.Class("MyObject", properties=[
344345
schema.RepeatedUnorderedProperty("foo", "bar")]),
345346
]) == {
346-
"FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
347-
a_ql_class(name="FakeRoot", final=True)),
348-
"MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
349-
a_ql_class(name="MyObject", final=True, properties=[
347+
"FakeRoot.qll": (a_ql_stub(name="FakeRoot", base_import=gen_import_prefix + "FakeRoot"),
348+
a_ql_class(name="FakeRoot", final=True)),
349+
"MyObject.qll": (a_ql_stub(name="MyObject", base_import=gen_import_prefix + "MyObject"),
350+
a_ql_class(name="MyObject", final=True, properties=[
350351
ql.Property(singular="Foo", plural="Foos", type="bar", tablename="my_object_foos",
351352
tableparams=["this", "result"], is_unordered=True,
352353
doc="foo of this my object", doc_plural="foos of this my object"),
353-
])),
354-
}
354+
])),
355+
}
355356

356357

357358
@pytest.mark.parametrize("is_child,prev_child", [(False, None), (True, "")])
@@ -588,8 +589,8 @@ def test_test_partial_properties(opts, generate_tests):
588589
is_indexed=True,
589590
type="int")),
590591
"B/B_getAW.ql": a_ql_property_tester(class_name="B",
591-
property=ql.PropertyForTest(getter="getAW", is_total=False,
592-
type="string")),
592+
property=ql.PropertyForTest(getter="getAW", is_total=False,
593+
type="string")),
593594
}
594595

595596

0 commit comments

Comments
 (0)