diff --git a/python/google/protobuf/descriptor_database.py b/python/google/protobuf/descriptor_database.py index ce57e8f5a8..ce0033efed 100644 --- a/python/google/protobuf/descriptor_database.py +++ b/python/google/protobuf/descriptor_database.py @@ -120,14 +120,7 @@ class DescriptorDatabase(object): Raises: KeyError if no file contains the specified symbol. """ - if symbol.count('.') == 1 and symbol[0] == '.': - symbol = symbol.lstrip('.') - warnings.warn( - 'Please remove the leading "." when ' - 'FindFileContainingSymbol, this will turn to error ' - 'in 2026 Jan.', - RuntimeWarning, - ) + symbol = symbol.lstrip('.') try: return self._file_desc_protos_by_symbol[symbol] except KeyError: diff --git a/python/google/protobuf/internal/descriptor_database_test.py b/python/google/protobuf/internal/descriptor_database_test.py index 0c99ba2669..696bdfb52f 100644 --- a/python/google/protobuf/internal/descriptor_database_test.py +++ b/python/google/protobuf/internal/descriptor_database_test.py @@ -95,6 +95,12 @@ class DescriptorDatabaseTest(unittest.TestCase): 'google.protobuf.python.internal.FACTORY_2_VALUE_0' ), ) + self.assertEqual( + file_desc_proto, + db.FindFileContainingSymbol( + '.google.protobuf.python.internal.FACTORY_2_VALUE_0' + ), + ) self.assertEqual( file_desc_proto2, db.FindFileContainingSymbol('NO_PACKAGE_VALUE_0') ) @@ -150,11 +156,6 @@ class DescriptorDatabaseTest(unittest.TestCase): with self.assertRaisesRegex(KeyError, r'\'proto2_unittest\.NoneMessage\''): db.FindFileContainingSymbol('proto2_unittest.NoneMessage') - with self.assertRaises(KeyError): - db.FindFileContainingSymbol( - '.google.protobuf.python.internal.FACTORY_2_VALUE_0' - ) - def testConflictRegister(self): db = descriptor_database.DescriptorDatabase() unittest_fd = descriptor_pb2.FileDescriptorProto.FromString(