make isinstance Container work

Summary: A follow-up to previous diff fixing `isinstance` `List`, `Map`, `Set`, for their parent class `Container`. In auto-migrat,e the control flow of `isinstance(obj, py3.types.Container)` should not change.

Reviewed By: fried

Differential Revision: D76142665

fbshipit-source-id: a7e834f63cb55421e98d380551c41bb38dede986

Author: ahilger

third-party/thrift/src/thrift/lib/py3/test/auto_migrate/lists.py

@@ -224,7 +224,6 @@ def test_list_from_iterable(self) -> None:
             [Color.red, Color.blue, Color.green],
         )
 
-    @brokenInAutoMigrate()
     def test_is_container(self) -> None:
         self.assertIsInstance(int_list, Container)
         self.assertIsInstance(I32List([1, 2, 3]), Container)

third-party/thrift/src/thrift/lib/py3/test/auto_migrate/maps.py

@@ -182,7 +182,6 @@ def test_equality(self) -> None:
         self.assertEqual(x, x)
         self.assertEqual(y, y)
 
-    @brokenInAutoMigrate()
     def test_is_container(self) -> None:
         self.assertIsInstance(LocationMap, Container)
         self.assertIsInstance(StrI32ListMap(), Container)

third-party/thrift/src/thrift/lib/py3/test/auto_migrate/sets.py

@@ -251,7 +251,6 @@ def test_set_op_return_type(self) -> None:
         self.assertIsInstance(x.__rxor__(y), expected_type)
         self.assertIsInstance(x.__rsub__(y), expected_type)
 
-    @brokenInAutoMigrate()
     def test_is_container(self) -> None:
         self.assertIsInstance(SetI32Lists(), Container)
         self.assertIsInstance(SetSetI32Lists(), Container)

third-party/thrift/src/thrift/lib/py3/types.pyx

@@ -34,6 +34,7 @@ from thrift.python.types cimport (
 )
 from apache.thrift.metadata.types_auto_migrated import _fbthrift__is_py3_auto_migrated
 from thrift.python.types import (
+    Container as _fbthrift_python_Container,
     Enum as _fbthrift_python_Enum,
     EnumMeta as _fbthrift_python_EnumMeta,
     Flag as _fbthrift_python_Flag,
@@ -392,6 +393,19 @@ cdef class Container:
     def __len__(self):
         raise NotImplementedError()
 
+class ContainerMeta(type):
+    def __instancecheck__(cls, inst):
+        if isinstance(inst, _fbthrift_python_Container):
+            return _fbthrift__is_py3_auto_migrated
+        return super().__instancecheck__(inst)
+
+    def __subclasscheck__(cls, sub):
+        if issubclass(sub, _fbthrift_python_Container):
+            return _fbthrift__is_py3_auto_migrated
+        return super().__subclasscheck__(sub)
+
+SetMetaClass(<PyTypeObject*> Container, <PyTypeObject*> ContainerMeta)
+
 cdef class _ListPrivateCtorToken:
     pass