fixed InterfaceObject and MethodObject not being serializable

lostmsu · lostmsu · commit e9c3a3d5230d · 2021-12-25T10:22:01.000-08:00
diff --git a/src/runtime/interfaceobject.cs b/src/runtime/interfaceobject.cs
@@ -13,15 +13,18 @@ namespace Python.Runtime
     [Serializable]
     internal class InterfaceObject : ClassBase
     {
+        [NonSerialized]
         internal ConstructorInfo? ctor;
 
         internal InterfaceObject(Type tp) : base(tp)
         {
-            var coclass = (CoClassAttribute)Attribute.GetCustomAttribute(tp, cc_attr);
-            if (coclass != null)
-            {
-                ctor = coclass.CoClass.GetConstructor(Type.EmptyTypes);
-            }
+            this.ctor = TryGetCOMConstructor(tp);
+        }
+
+        static ConstructorInfo? TryGetCOMConstructor(Type tp)
+        {
+            var comClass = (CoClassAttribute?)Attribute.GetCustomAttribute(tp, cc_attr);
+            return comClass?.CoClass.GetConstructor(Type.EmptyTypes);
         }
 
         private static Type cc_attr;
@@ -113,5 +116,14 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
 
             return Runtime.PyObject_GenericGetAttr(ob, key);
         }
+
+        protected override void OnDeserialization(object sender)
+        {
+            base.OnDeserialization(sender);
+            if (this.type.Valid)
+            {
+                this.ctor = TryGetCOMConstructor(this.type.Value);
+            }
+        }
     }
 }
diff --git a/src/runtime/methodobject.cs b/src/runtime/methodobject.cs
@@ -25,7 +25,7 @@ internal class MethodObject : ExtensionType
         internal bool is_static = false;
 
         internal PyString? doc;
-        internal Type type;
+        internal MaybeType type;
 
         public MethodObject(Type type, string name, MethodInfo[] info, bool allow_threads = MethodBinder.DefaultAllowThreads)
         {
@@ -157,6 +157,11 @@ public static NewReference tp_descr_get(BorrowedReference ds, BorrowedReference
         {
             var self = (MethodObject)GetManagedObject(ds)!;
 
+            if (!self.type.Valid)
+            {
+                return Exceptions.RaiseTypeError(self.type.DeletedMessage);
+            }
+
             // If the method is accessed through its type (rather than via
             // an instance) we return an 'unbound' MethodBinding that will
             // cached for future accesses through the type.
@@ -178,11 +183,11 @@ public static NewReference tp_descr_get(BorrowedReference ds, BorrowedReference
             // In which case create a MethodBinding bound to the base class.
             var obj = GetManagedObject(ob) as CLRObject;
             if (obj != null
-                && obj.inst.GetType() != self.type
+                && obj.inst.GetType() != self.type.Value
                 && obj.inst is IPythonDerivedType
-                && self.type.IsInstanceOfType(obj.inst))
+                && self.type.Value.IsInstanceOfType(obj.inst))
             {
-                var basecls = ClassManager.GetClass(self.type);
+                var basecls = ClassManager.GetClass(self.type.Value);
                 return new MethodBinding(self, new PyObject(ob), basecls).Alloc();
             }
 
