Skip to content

Commit 5ba80c2

Browse files
akb825dbaileychess
akb825
and
dbaileychess
authored
Fix python type annotation output when not enabled (#7983)
Fixes #7971 Co-authored-by: Derek Bailey <derekbailey@google.com>
1 parent da55ac3 commit 5ba80c2

11 files changed

Lines changed: 48 additions & 44 deletions

File tree

‎python/flatbuffers/reflection/Enum.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ def AddValues(builder, values):
152152
def EnumStartValuesVector(builder, numElems):
153153
return builder.StartVector(4, numElems, 4)
154154

155-
def StartValuesVector(builder, numElems: int) -> int:
155+
def StartValuesVector(builder, numElems):
156156
return EnumStartValuesVector(builder, numElems)
157157

158158
def EnumAddIsUnion(builder, isUnion):
@@ -176,7 +176,7 @@ def AddAttributes(builder, attributes):
176176
def EnumStartAttributesVector(builder, numElems):
177177
return builder.StartVector(4, numElems, 4)
178178

179-
def StartAttributesVector(builder, numElems: int) -> int:
179+
def StartAttributesVector(builder, numElems):
180180
return EnumStartAttributesVector(builder, numElems)
181181

182182
def EnumAddDocumentation(builder, documentation):
@@ -188,7 +188,7 @@ def AddDocumentation(builder, documentation):
188188
def EnumStartDocumentationVector(builder, numElems):
189189
return builder.StartVector(4, numElems, 4)
190190

191-
def StartDocumentationVector(builder, numElems: int) -> int:
191+
def StartDocumentationVector(builder, numElems):
192192
return EnumStartDocumentationVector(builder, numElems)
193193

194194
def EnumAddDeclarationFile(builder, declarationFile):

‎python/flatbuffers/reflection/EnumVal.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def AddDocumentation(builder, documentation):
131131
def EnumValStartDocumentationVector(builder, numElems):
132132
return builder.StartVector(4, numElems, 4)
133133

134-
def StartDocumentationVector(builder, numElems: int) -> int:
134+
def StartDocumentationVector(builder, numElems):
135135
return EnumValStartDocumentationVector(builder, numElems)
136136

137137
def EnumValAddAttributes(builder, attributes):
@@ -143,7 +143,7 @@ def AddAttributes(builder, attributes):
143143
def EnumValStartAttributesVector(builder, numElems):
144144
return builder.StartVector(4, numElems, 4)
145145

146-
def StartAttributesVector(builder, numElems: int) -> int:
146+
def StartAttributesVector(builder, numElems):
147147
return EnumValStartAttributesVector(builder, numElems)
148148

149149
def EnumValEnd(builder):

‎python/flatbuffers/reflection/Field.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ def AddAttributes(builder, attributes):
232232
def FieldStartAttributesVector(builder, numElems):
233233
return builder.StartVector(4, numElems, 4)
234234

235-
def StartAttributesVector(builder, numElems: int) -> int:
235+
def StartAttributesVector(builder, numElems):
236236
return FieldStartAttributesVector(builder, numElems)
237237

238238
def FieldAddDocumentation(builder, documentation):
@@ -244,7 +244,7 @@ def AddDocumentation(builder, documentation):
244244
def FieldStartDocumentationVector(builder, numElems):
245245
return builder.StartVector(4, numElems, 4)
246246

247-
def StartDocumentationVector(builder, numElems: int) -> int:
247+
def StartDocumentationVector(builder, numElems):
248248
return FieldStartDocumentationVector(builder, numElems)
249249

250250
def FieldAddOptional(builder, optional):

‎python/flatbuffers/reflection/Object.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def AddFields(builder, fields):
155155
def ObjectStartFieldsVector(builder, numElems):
156156
return builder.StartVector(4, numElems, 4)
157157

158-
def StartFieldsVector(builder, numElems: int) -> int:
158+
def StartFieldsVector(builder, numElems):
159159
return ObjectStartFieldsVector(builder, numElems)
160160

161161
def ObjectAddIsStruct(builder, isStruct):
@@ -185,7 +185,7 @@ def AddAttributes(builder, attributes):
185185
def ObjectStartAttributesVector(builder, numElems):
186186
return builder.StartVector(4, numElems, 4)
187187

188-
def StartAttributesVector(builder, numElems: int) -> int:
188+
def StartAttributesVector(builder, numElems):
189189
return ObjectStartAttributesVector(builder, numElems)
190190

191191
def ObjectAddDocumentation(builder, documentation):
@@ -197,7 +197,7 @@ def AddDocumentation(builder, documentation):
197197
def ObjectStartDocumentationVector(builder, numElems):
198198
return builder.StartVector(4, numElems, 4)
199199

200-
def StartDocumentationVector(builder, numElems: int) -> int:
200+
def StartDocumentationVector(builder, numElems):
201201
return ObjectStartDocumentationVector(builder, numElems)
202202

203203
def ObjectAddDeclarationFile(builder, declarationFile):

‎python/flatbuffers/reflection/RPCCall.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ def AddAttributes(builder, attributes):
135135
def RPCCallStartAttributesVector(builder, numElems):
136136
return builder.StartVector(4, numElems, 4)
137137

138-
def StartAttributesVector(builder, numElems: int) -> int:
138+
def StartAttributesVector(builder, numElems):
139139
return RPCCallStartAttributesVector(builder, numElems)
140140

141141
def RPCCallAddDocumentation(builder, documentation):
@@ -147,7 +147,7 @@ def AddDocumentation(builder, documentation):
147147
def RPCCallStartDocumentationVector(builder, numElems):
148148
return builder.StartVector(4, numElems, 4)
149149

150-
def StartDocumentationVector(builder, numElems: int) -> int:
150+
def StartDocumentationVector(builder, numElems):
151151
return RPCCallStartDocumentationVector(builder, numElems)
152152

153153
def RPCCallEnd(builder):

‎python/flatbuffers/reflection/Schema.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def AddObjects(builder, objects):
177177
def SchemaStartObjectsVector(builder, numElems):
178178
return builder.StartVector(4, numElems, 4)
179179

180-
def StartObjectsVector(builder, numElems: int) -> int:
180+
def StartObjectsVector(builder, numElems):
181181
return SchemaStartObjectsVector(builder, numElems)
182182

183183
def SchemaAddEnums(builder, enums):
@@ -189,7 +189,7 @@ def AddEnums(builder, enums):
189189
def SchemaStartEnumsVector(builder, numElems):
190190
return builder.StartVector(4, numElems, 4)
191191

192-
def StartEnumsVector(builder, numElems: int) -> int:
192+
def StartEnumsVector(builder, numElems):
193193
return SchemaStartEnumsVector(builder, numElems)
194194

195195
def SchemaAddFileIdent(builder, fileIdent):
@@ -219,7 +219,7 @@ def AddServices(builder, services):
219219
def SchemaStartServicesVector(builder, numElems):
220220
return builder.StartVector(4, numElems, 4)
221221

222-
def StartServicesVector(builder, numElems: int) -> int:
222+
def StartServicesVector(builder, numElems):
223223
return SchemaStartServicesVector(builder, numElems)
224224

225225
def SchemaAddAdvancedFeatures(builder, advancedFeatures):
@@ -237,7 +237,7 @@ def AddFbsFiles(builder, fbsFiles):
237237
def SchemaStartFbsFilesVector(builder, numElems):
238238
return builder.StartVector(4, numElems, 4)
239239

240-
def StartFbsFilesVector(builder, numElems: int) -> int:
240+
def StartFbsFilesVector(builder, numElems):
241241
return SchemaStartFbsFilesVector(builder, numElems)
242242

243243
def SchemaEnd(builder):

‎python/flatbuffers/reflection/SchemaFile.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def AddIncludedFilenames(builder, includedFilenames):
8181
def SchemaFileStartIncludedFilenamesVector(builder, numElems):
8282
return builder.StartVector(4, numElems, 4)
8383

84-
def StartIncludedFilenamesVector(builder, numElems: int) -> int:
84+
def StartIncludedFilenamesVector(builder, numElems):
8585
return SchemaFileStartIncludedFilenamesVector(builder, numElems)
8686

8787
def SchemaFileEnd(builder):

‎python/flatbuffers/reflection/Service.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def AddCalls(builder, calls):
134134
def ServiceStartCallsVector(builder, numElems):
135135
return builder.StartVector(4, numElems, 4)
136136

137-
def StartCallsVector(builder, numElems: int) -> int:
137+
def StartCallsVector(builder, numElems):
138138
return ServiceStartCallsVector(builder, numElems)
139139

140140
def ServiceAddAttributes(builder, attributes):
@@ -146,7 +146,7 @@ def AddAttributes(builder, attributes):
146146
def ServiceStartAttributesVector(builder, numElems):
147147
return builder.StartVector(4, numElems, 4)
148148

149-
def StartAttributesVector(builder, numElems: int) -> int:
149+
def StartAttributesVector(builder, numElems):
150150
return ServiceStartAttributesVector(builder, numElems)
151151

152152
def ServiceAddDocumentation(builder, documentation):
@@ -158,7 +158,7 @@ def AddDocumentation(builder, documentation):
158158
def ServiceStartDocumentationVector(builder, numElems):
159159
return builder.StartVector(4, numElems, 4)
160160

161-
def StartDocumentationVector(builder, numElems: int) -> int:
161+
def StartDocumentationVector(builder, numElems):
162162
return ServiceStartDocumentationVector(builder, numElems)
163163

164164
def ServiceAddDeclarationFile(builder, declarationFile):

‎src/idl_gen_python.cpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -815,8 +815,12 @@ class PythonGenerator : public BaseGenerator {
815815

816816
if (!parser_.opts.one_file && !parser_.opts.python_no_type_prefix_suffix) {
817817
// Generate method without struct name.
818-
code += "def Start" + field_method +
819-
"Vector(builder, numElems: int) -> int:\n";
818+
if (parser_.opts.python_typing) {
819+
code += "def Start" + field_method +
820+
"Vector(builder, numElems: int) -> int:\n";
821+
} else {
822+
code += "def Start" + field_method + "Vector(builder, numElems):\n";
823+
}
820824
code += Indent + "return " + struct_type + "Start";
821825
code += field_method + "Vector(builder, numElems)\n\n";
822826
}

‎tests/MyGame/Example/Monster.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ def AddInventory(builder, inventory):
911911
def MonsterStartInventoryVector(builder, numElems):
912912
return builder.StartVector(1, numElems, 1)
913913

914-
def StartInventoryVector(builder, numElems: int) -> int:
914+
def StartInventoryVector(builder, numElems):
915915
return MonsterStartInventoryVector(builder, numElems)
916916

917917
def MonsterAddColor(builder, color):
@@ -941,7 +941,7 @@ def AddTest4(builder, test4):
941941
def MonsterStartTest4Vector(builder, numElems):
942942
return builder.StartVector(4, numElems, 2)
943943

944-
def StartTest4Vector(builder, numElems: int) -> int:
944+
def StartTest4Vector(builder, numElems):
945945
return MonsterStartTest4Vector(builder, numElems)
946946

947947
def MonsterAddTestarrayofstring(builder, testarrayofstring):
@@ -953,7 +953,7 @@ def AddTestarrayofstring(builder, testarrayofstring):
953953
def MonsterStartTestarrayofstringVector(builder, numElems):
954954
return builder.StartVector(4, numElems, 4)
955955

956-
def StartTestarrayofstringVector(builder, numElems: int) -> int:
956+
def StartTestarrayofstringVector(builder, numElems):
957957
return MonsterStartTestarrayofstringVector(builder, numElems)
958958

959959
def MonsterAddTestarrayoftables(builder, testarrayoftables):
@@ -965,7 +965,7 @@ def AddTestarrayoftables(builder, testarrayoftables):
965965
def MonsterStartTestarrayoftablesVector(builder, numElems):
966966
return builder.StartVector(4, numElems, 4)
967967

968-
def StartTestarrayoftablesVector(builder, numElems: int) -> int:
968+
def StartTestarrayoftablesVector(builder, numElems):
969969
return MonsterStartTestarrayoftablesVector(builder, numElems)
970970

971971
def MonsterAddEnemy(builder, enemy):
@@ -983,7 +983,7 @@ def AddTestnestedflatbuffer(builder, testnestedflatbuffer):
983983
def MonsterStartTestnestedflatbufferVector(builder, numElems):
984984
return builder.StartVector(1, numElems, 1)
985985

986-
def StartTestnestedflatbufferVector(builder, numElems: int) -> int:
986+
def StartTestnestedflatbufferVector(builder, numElems):
987987
return MonsterStartTestnestedflatbufferVector(builder, numElems)
988988

989989
def MonsterMakeTestnestedflatbufferVectorFromBytes(builder, bytes):
@@ -1062,7 +1062,7 @@ def AddTestarrayofbools(builder, testarrayofbools):
10621062
def MonsterStartTestarrayofboolsVector(builder, numElems):
10631063
return builder.StartVector(1, numElems, 1)
10641064

1065-
def StartTestarrayofboolsVector(builder, numElems: int) -> int:
1065+
def StartTestarrayofboolsVector(builder, numElems):
10661066
return MonsterStartTestarrayofboolsVector(builder, numElems)
10671067

10681068
def MonsterAddTestf(builder, testf):
@@ -1092,7 +1092,7 @@ def AddTestarrayofstring2(builder, testarrayofstring2):
10921092
def MonsterStartTestarrayofstring2Vector(builder, numElems):
10931093
return builder.StartVector(4, numElems, 4)
10941094

1095-
def StartTestarrayofstring2Vector(builder, numElems: int) -> int:
1095+
def StartTestarrayofstring2Vector(builder, numElems):
10961096
return MonsterStartTestarrayofstring2Vector(builder, numElems)
10971097

10981098
def MonsterAddTestarrayofsortedstruct(builder, testarrayofsortedstruct):
@@ -1104,7 +1104,7 @@ def AddTestarrayofsortedstruct(builder, testarrayofsortedstruct):
11041104
def MonsterStartTestarrayofsortedstructVector(builder, numElems):
11051105
return builder.StartVector(8, numElems, 4)
11061106

1107-
def StartTestarrayofsortedstructVector(builder, numElems: int) -> int:
1107+
def StartTestarrayofsortedstructVector(builder, numElems):
11081108
return MonsterStartTestarrayofsortedstructVector(builder, numElems)
11091109

11101110
def MonsterAddFlex(builder, flex):
@@ -1116,7 +1116,7 @@ def AddFlex(builder, flex):
11161116
def MonsterStartFlexVector(builder, numElems):
11171117
return builder.StartVector(1, numElems, 1)
11181118

1119-
def StartFlexVector(builder, numElems: int) -> int:
1119+
def StartFlexVector(builder, numElems):
11201120
return MonsterStartFlexVector(builder, numElems)
11211121

11221122
def MonsterAddTest5(builder, test5):
@@ -1128,7 +1128,7 @@ def AddTest5(builder, test5):
11281128
def MonsterStartTest5Vector(builder, numElems):
11291129
return builder.StartVector(4, numElems, 2)
11301130

1131-
def StartTest5Vector(builder, numElems: int) -> int:
1131+
def StartTest5Vector(builder, numElems):
11321132
return MonsterStartTest5Vector(builder, numElems)
11331133

11341134
def MonsterAddVectorOfLongs(builder, vectorOfLongs):
@@ -1140,7 +1140,7 @@ def AddVectorOfLongs(builder, vectorOfLongs):
11401140
def MonsterStartVectorOfLongsVector(builder, numElems):
11411141
return builder.StartVector(8, numElems, 8)
11421142

1143-
def StartVectorOfLongsVector(builder, numElems: int) -> int:
1143+
def StartVectorOfLongsVector(builder, numElems):
11441144
return MonsterStartVectorOfLongsVector(builder, numElems)
11451145

11461146
def MonsterAddVectorOfDoubles(builder, vectorOfDoubles):
@@ -1152,7 +1152,7 @@ def AddVectorOfDoubles(builder, vectorOfDoubles):
11521152
def MonsterStartVectorOfDoublesVector(builder, numElems):
11531153
return builder.StartVector(8, numElems, 8)
11541154

1155-
def StartVectorOfDoublesVector(builder, numElems: int) -> int:
1155+
def StartVectorOfDoublesVector(builder, numElems):
11561156
return MonsterStartVectorOfDoublesVector(builder, numElems)
11571157

11581158
def MonsterAddParentNamespaceTest(builder, parentNamespaceTest):
@@ -1170,7 +1170,7 @@ def AddVectorOfReferrables(builder, vectorOfReferrables):
11701170
def MonsterStartVectorOfReferrablesVector(builder, numElems):
11711171
return builder.StartVector(4, numElems, 4)
11721172

1173-
def StartVectorOfReferrablesVector(builder, numElems: int) -> int:
1173+
def StartVectorOfReferrablesVector(builder, numElems):
11741174
return MonsterStartVectorOfReferrablesVector(builder, numElems)
11751175

11761176
def MonsterAddSingleWeakReference(builder, singleWeakReference):
@@ -1188,7 +1188,7 @@ def AddVectorOfWeakReferences(builder, vectorOfWeakReferences):
11881188
def MonsterStartVectorOfWeakReferencesVector(builder, numElems):
11891189
return builder.StartVector(8, numElems, 8)
11901190

1191-
def StartVectorOfWeakReferencesVector(builder, numElems: int) -> int:
1191+
def StartVectorOfWeakReferencesVector(builder, numElems):
11921192
return MonsterStartVectorOfWeakReferencesVector(builder, numElems)
11931193

11941194
def MonsterAddVectorOfStrongReferrables(builder, vectorOfStrongReferrables):
@@ -1200,7 +1200,7 @@ def AddVectorOfStrongReferrables(builder, vectorOfStrongReferrables):
12001200
def MonsterStartVectorOfStrongReferrablesVector(builder, numElems):
12011201
return builder.StartVector(4, numElems, 4)
12021202

1203-
def StartVectorOfStrongReferrablesVector(builder, numElems: int) -> int:
1203+
def StartVectorOfStrongReferrablesVector(builder, numElems):
12041204
return MonsterStartVectorOfStrongReferrablesVector(builder, numElems)
12051205

12061206
def MonsterAddCoOwningReference(builder, coOwningReference):
@@ -1218,7 +1218,7 @@ def AddVectorOfCoOwningReferences(builder, vectorOfCoOwningReferences):
12181218
def MonsterStartVectorOfCoOwningReferencesVector(builder, numElems):
12191219
return builder.StartVector(8, numElems, 8)
12201220

1221-
def StartVectorOfCoOwningReferencesVector(builder, numElems: int) -> int:
1221+
def StartVectorOfCoOwningReferencesVector(builder, numElems):
12221222
return MonsterStartVectorOfCoOwningReferencesVector(builder, numElems)
12231223

12241224
def MonsterAddNonOwningReference(builder, nonOwningReference):
@@ -1236,7 +1236,7 @@ def AddVectorOfNonOwningReferences(builder, vectorOfNonOwningReferences):
12361236
def MonsterStartVectorOfNonOwningReferencesVector(builder, numElems):
12371237
return builder.StartVector(8, numElems, 8)
12381238

1239-
def StartVectorOfNonOwningReferencesVector(builder, numElems: int) -> int:
1239+
def StartVectorOfNonOwningReferencesVector(builder, numElems):
12401240
return MonsterStartVectorOfNonOwningReferencesVector(builder, numElems)
12411241

12421242
def MonsterAddAnyUniqueType(builder, anyUniqueType):
@@ -1272,7 +1272,7 @@ def AddVectorOfEnums(builder, vectorOfEnums):
12721272
def MonsterStartVectorOfEnumsVector(builder, numElems):
12731273
return builder.StartVector(1, numElems, 1)
12741274

1275-
def StartVectorOfEnumsVector(builder, numElems: int) -> int:
1275+
def StartVectorOfEnumsVector(builder, numElems):
12761276
return MonsterStartVectorOfEnumsVector(builder, numElems)
12771277

12781278
def MonsterAddSignedEnum(builder, signedEnum):
@@ -1290,7 +1290,7 @@ def AddTestrequirednestedflatbuffer(builder, testrequirednestedflatbuffer):
12901290
def MonsterStartTestrequirednestedflatbufferVector(builder, numElems):
12911291
return builder.StartVector(1, numElems, 1)
12921292

1293-
def StartTestrequirednestedflatbufferVector(builder, numElems: int) -> int:
1293+
def StartTestrequirednestedflatbufferVector(builder, numElems):
12941294
return MonsterStartTestrequirednestedflatbufferVector(builder, numElems)
12951295

12961296
def MonsterMakeTestrequirednestedflatbufferVectorFromBytes(builder, bytes):
@@ -1309,7 +1309,7 @@ def AddScalarKeySortedTables(builder, scalarKeySortedTables):
13091309
def MonsterStartScalarKeySortedTablesVector(builder, numElems):
13101310
return builder.StartVector(4, numElems, 4)
13111311

1312-
def StartScalarKeySortedTablesVector(builder, numElems: int) -> int:
1312+
def StartScalarKeySortedTablesVector(builder, numElems):
13131313
return MonsterStartScalarKeySortedTablesVector(builder, numElems)
13141314

13151315
def MonsterAddNativeInline(builder, nativeInline):

0 commit comments

Comments
 (0)