diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-07-18 15:38:30 -0700 |
| commit | 09354db1434859a31a3c81abebcc4018d42f2715 (patch) | |
| tree | b87c7cdc2255e6c8062ab92b4082665cd698d753 /python/google/protobuf/descriptor_database.py | |
| parent | 9053033a5076f82cf18b823c31f352e95e5bfd8d (diff) | |
| download | protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.gz protobuf-09354db1434859a31a3c81abebcc4018d42f2715.tar.bz2 protobuf-09354db1434859a31a3c81abebcc4018d42f2715.zip | |
Merge from Google internal for 3.4 release
Diffstat (limited to 'python/google/protobuf/descriptor_database.py')
| -rw-r--r-- | python/google/protobuf/descriptor_database.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/python/google/protobuf/descriptor_database.py b/python/google/protobuf/descriptor_database.py index 40bcdd72..eb45e127 100644 --- a/python/google/protobuf/descriptor_database.py +++ b/python/google/protobuf/descriptor_database.py @@ -134,8 +134,7 @@ def _ExtractSymbols(desc_proto, package): Yields: The fully qualified name found in the descriptor. """ - - message_name = '.'.join((package, desc_proto.name)) + message_name = package + '.' + desc_proto.name if package else desc_proto.name yield message_name for nested_type in desc_proto.nested_type: for symbol in _ExtractSymbols(nested_type, message_name): |