Mark the python generator for editions support.

mkruskal-google · copybara-github · commit b01bd1ba17e8 · 2023-11-13T17:52:32.000-08:00
Editions has been implemented in all three implementations already, and this simply enables it.

PiperOrigin-RevId: 582139104
diff --git a/src/google/protobuf/compiler/python/generator.h b/src/google/protobuf/compiler/python/generator.h
@@ -66,7 +66,8 @@ class PROTOC_EXPORT Generator : public CodeGenerator {
                 std::string* error) const override;
 
   uint64_t GetSupportedFeatures() const override {
-    return Feature::FEATURE_PROTO3_OPTIONAL;
+    return Feature::FEATURE_PROTO3_OPTIONAL |
+           Feature::FEATURE_SUPPORTS_EDITIONS;
   }
   Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }
   Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }
diff --git a/src/google/protobuf/compiler/python/pyi_generator.h b/src/google/protobuf/compiler/python/pyi_generator.h
@@ -48,7 +48,8 @@ class PROTOC_EXPORT PyiGenerator : public google::protobuf::compiler::CodeGenera
   // CodeGenerator methods.
   uint64_t GetSupportedFeatures() const override {
     // Code generators must explicitly support proto3 optional.
-    return CodeGenerator::FEATURE_PROTO3_OPTIONAL;
+    return Feature::FEATURE_PROTO3_OPTIONAL |
+           Feature::FEATURE_SUPPORTS_EDITIONS;
   }
   bool Generate(const FileDescriptor* file, const std::string& parameter,
                 GeneratorContext* generator_context,

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,8 @@ class PROTOC_EXPORT Generator : public CodeGenerator {`
`66`	`66`	`std::string* error) const override;`
`67`	`67`
`68`	`68`	`uint64_t GetSupportedFeatures() const override {`
`69`		`- return Feature::FEATURE_PROTO3_OPTIONAL;`
	`69`	`+ return Feature::FEATURE_PROTO3_OPTIONAL \|`
	`70`	`+ Feature::FEATURE_SUPPORTS_EDITIONS;`
`70`	`71`	`}`
`71`	`72`	`Edition GetMinimumEdition() const override { return Edition::EDITION_PROTO2; }`
`72`	`73`	`Edition GetMaximumEdition() const override { return Edition::EDITION_2023; }`