Fixed a few tests: extensions are not fields.

python/descriptor_pool.c

@@ -264,20 +264,15 @@ static PyObject* PyUpb_DescriptorPool_FindFieldByName(PyObject* _self,
   const char* name = PyUpb_GetStrData(arg);
   if (!name) return NULL;
 
-  // First lookup as extension.
-  const upb_fielddef* f = upb_symtab_lookupext(self->symtab, name);
-
-  if (!f) {
-    // Otherwise look for a normal field.
-    size_t parent_size;
-    const char* child =
-        PyUpb_DescriptorPool_SplitSymbolName(name, &parent_size);
-    if (child) {
-      const upb_msgdef* parent =
-          upb_symtab_lookupmsg2(self->symtab, name, parent_size);
-      if (parent) {
-        f = upb_msgdef_ntofz(parent, child);
-      }
+  size_t parent_size;
+  const char* child =
+      PyUpb_DescriptorPool_SplitSymbolName(name, &parent_size);
+  const upb_fielddef* f = NULL;
+  if (child) {
+    const upb_msgdef* parent =
+        upb_symtab_lookupmsg2(self->symtab, name, parent_size);
+    if (parent) {
+      f = upb_msgdef_ntofz(parent, child);
     }
   }
 

python/pb_unit_tests/descriptor_pool_test_wrapper.py

@@ -52,12 +52,10 @@ def wrap(cls, method):
 wrap(descriptor_pool_test.CreateDescriptorPoolTest, "testAddFileDescriptor")
 wrap(descriptor_pool_test.CreateDescriptorPoolTest, "testAddSerializedFile")
 wrap(descriptor_pool_test.CreateDescriptorPoolTest, "testComplexNesting")
-wrap(descriptor_pool_test.CreateDescriptorPoolTest, "testExtensionsAreNotFields")
 wrap(descriptor_pool_test.DefaultDescriptorPoolTest, "testAddFileDescriptor")
 wrap(descriptor_pool_test.DefaultDescriptorPoolTest, "testAddSerializedFile")
 wrap(descriptor_pool_test.DefaultDescriptorPoolTest, "testComplexNesting")
 wrap(descriptor_pool_test.DefaultDescriptorPoolTest, "testEnumDefaultValue")
-wrap(descriptor_pool_test.DefaultDescriptorPoolTest, "testExtensionsAreNotFields")
 wrap(descriptor_pool_test.SecondaryDescriptorFromDescriptorDB, "testFindAllExtensions")
 wrap(descriptor_pool_test.SecondaryDescriptorFromDescriptorDB, "testFindEnumTypeByName")
 wrap(descriptor_pool_test.SecondaryDescriptorFromDescriptorDB, "testFindExtensionByName")