fix python code generation compatibility with Cython

[vthib]

This is a follow-up to #11011

The generation is still not compatible with Cython when maps are used.

For example, this protobuf file:

syntax = "proto3";

message Foo {
    map<string, string> bar = 1;
}

Will generate:

...
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'a_pb2', _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
  _FOO_BARENTRY._options = None
  _FOO_BARENTRY._serialized_options = b'8\001'
  _globals['_FOO']._serialized_start=11
  _globals['_FOO']._serialized_end=88
  _globals['_FOO_BARENTRY']._serialized_start=46
  _globals['_FOO_BARENTRY']._serialized_end=88

The _FOO_BARENTRY variable is not defined anywhere and confuses cython. We can see the _globals used below, it is simply missing for the first two lines using _FOO_BARENTRY.

If possible, i would love to have this fix in the next 24 release, instead of having to wait for the 25 release.

[anandolee]

Thank you for the PR. As it changes generated code, I may need to run a wide tests in google internal and submit there

[anandolee]

Turns out tests can not pass. Example error:

_globals['_ANY.fields_by_name['type_url']']._options = None
SyntaxError: invalid syntax. Perhaps you forgot a comma?

I will update the fix

[anandolee]

should be fixed with e65d051

[vthib]

Thanks!

[vthib]

@anandolee Is it possible to backport this fix into the next 24.X release?

[vthib]

@anandolee Sorry for the bother, I saw the new release 24.3 release but it does not contain this fix. Is it possible to backport it for the next 24.X release please?

[vthib]

@anandolee Can I do a PR to backport this fix into the 24.X branch?

[vthib]

I pushed a PR request for the backport here: #14240

[hothanhloc68]

This is a follow-up to #11011

The generation is still not compatible with Cython when maps are used.

For example, this protobuf file:

syntax = "proto3";

message Foo {
    map<string, string> bar = 1;
}

Will generate:

...
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'a_pb2', _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
  _FOO_BARENTRY._options = None
  _FOO_BARENTRY._serialized_options = b'8\001'
  _globals['_FOO']._serialized_start=11
  _globals['_FOO']._serialized_end=88
  _globals['_FOO_BARENTRY']._serialized_start=46
  _globals['_FOO_BARENTRY']._serialized_end=88

The _FOO_BARENTRY variable is not defined anywhere and confuses cython. We can see the _globals used below, it is simply missing for the first two lines using _FOO_BARENTRY.

If possible, i would love to have this fix in the next 24 release, instead of having to wait for the 25 release.

[hothanhloc68]

This is a follow-up to #11011

The generation is still not compatible with Cython when maps are used.

For example, this protobuf file:

syntax = "proto3";

message Foo {
    map<string, string> bar = 1;
}

Will generate:

...
_globals = globals()
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'a_pb2', _globals)
if _descriptor._USE_C_DESCRIPTORS == False:

  DESCRIPTOR._options = None
  _FOO_BARENTRY._options = None
  _FOO_BARENTRY._serialized_options = b'8\001'
  _globals['_FOO']._serialized_start=11
  _globals['_FOO']._serialized_end=88
  _globals['_FOO_BARENTRY']._serialized_start=46
  _globals['_FOO_BARENTRY']._serialized_end=88

The _FOO_BARENTRY variable is not defined anywhere and confuses cython. We can see the _globals used below, it is simply missing for the first two lines using _FOO_BARENTRY.

If possible, i would love to have this fix in the next 24 release, instead of having to wait for the 25 release.

[hothanhloc68]

Turns out tests can not pass. Example error:

_globals['_ANY.fields_by_name['type_url']']._options = None
SyntaxError: invalid syntax. Perhaps you forgot a comma?

I will update the fix