refactoring in CreateSubType

lostmsu · lostmsu · commit a07d402b9dc6 · 2020-12-17T15:55:36.000-08:00
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
@@ -311,42 +311,27 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr
             object assembly = null;
             object namespaceStr = null;
 
-            var disposeList = new List<PyObject>();
-            try
+            using (var assemblyKey = new PyString("__assembly__"))
             {
-                var assemblyKey = new PyObject(Converter.ToPython("__assembly__", typeof(string)));
-                disposeList.Add(assemblyKey);
-                if (0 != Runtime.PyMapping_HasKey(py_dict, assemblyKey.Handle))
+                IntPtr assemblyPtr = Runtime.PyDict_GetItem(py_dict, assemblyKey.Handle);
+                if (assemblyPtr == IntPtr.Zero) return IntPtr.Zero;
+
+                if (!Converter.ToManagedValue(assemblyPtr, typeof(string), out assembly, false))
                 {
-                    var pyAssembly = new PyObject(Runtime.PyDict_GetItem(py_dict, assemblyKey.Handle));
-                    Runtime.XIncref(pyAssembly.Handle);
-                    disposeList.Add(pyAssembly);
-                    if (!Converter.ToManagedValue(pyAssembly.Handle, typeof(string), out assembly, false))
-                    {
-                        throw new InvalidCastException("Couldn't convert __assembly__ value to string");
-                    }
+                    return Exceptions.RaiseTypeError("Couldn't convert __assembly__ value to string");
                 }
 
-                var namespaceKey = new PyObject(Converter.ToPythonImplicit("__namespace__"));
-                disposeList.Add(namespaceKey);
-                if (0 != Runtime.PyMapping_HasKey(py_dict, namespaceKey.Handle))
+                using (var namespaceKey = new PyString("__namespace__"))
                 {
-                    var pyNamespace = new PyObject(Runtime.PyDict_GetItem(py_dict, namespaceKey.Handle));
-                    Runtime.XIncref(pyNamespace.Handle);
-                    disposeList.Add(pyNamespace);
-                    if (!Converter.ToManagedValue(pyNamespace.Handle, typeof(string), out namespaceStr, false))
+                    IntPtr pyNamespace = Runtime.PyDict_GetItem(py_dict, namespaceKey.Handle);
+                    if (pyNamespace == IntPtr.Zero) return IntPtr.Zero;
+
+                    if (!Converter.ToManagedValue(pyNamespace, typeof(string), out namespaceStr, false))
                     {
-                        throw new InvalidCastException("Couldn't convert __namespace__ value to string");
+                        return Exceptions.RaiseTypeError("Couldn't convert __namespace__ value to string");
                     }
                 }
             }
-            finally
-            {
-                foreach (PyObject o in disposeList)
-                {
-                    o.Dispose();
-                }
-            }
 
             // create the new managed type subclassing the base managed type
             var baseClass = ManagedType.GetManagedObject(py_base_type) as ClassBase;
@@ -370,7 +355,7 @@ internal static IntPtr CreateSubType(IntPtr py_name, IntPtr py_base_type, IntPtr
                 // by default the class dict will have all the C# methods in it, but as this is a
                 // derived class we want the python overrides in there instead if they exist.
                 IntPtr cls_dict = Marshal.ReadIntPtr(py_type, TypeOffset.tp_dict);
-                Runtime.PyDict_Update(cls_dict, py_dict);
+                PythonException.ThrowIfIsNotZero(Runtime.PyDict_Update(cls_dict, py_dict));
                 Runtime.XIncref(py_type);
                 // Update the __classcell__ if it exists
                 var cell = new BorrowedReference(Runtime.PyDict_GetItemString(cls_dict, "__classcell__"));
