pythonnet · BadSingleton · Dec 17, 2019 · Dec 18, 2019 · Jan 14, 2020 · Jan 17, 2020
diff --git a/AUTHORS.md b/AUTHORS.md
@@ -29,6 +29,7 @@
 -   David Lassonde ([@lassond](https://github.com/lassond))
 -   David Lechner ([@dlech](https://github.com/dlech))
 -   Dmitriy Se ([@dmitriyse](https://github.com/dmitriyse))
+-   Félix Bourbonnais ([@BadSingleton](https://github.com/BadSingleton))
 -   Florian Treurniet ([@ftreurni](https://github.com/ftreurni))
 -   He-chien Tsai ([@t3476](https://github.com/t3476))
 -   Inna Wiesel ([@inna-w](https://github.com/inna-w))

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG][].
 -   Added support for converting python iterators to C# arrays
 -   Changed usage of obselete function GetDelegateForFunctionPointer(IntPtr, Type) to GetDelegateForFunctionPointer<TDelegate>(IntPtr)
 -   Added support for kwarg parameters when calling .NET methods from Python
+-   Added cleanup logic for the managed types on shutdown.
 
 ### Fixed
 

diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
@@ -509,7 +509,7 @@ internal static ThunkInfo GetThunk(MethodInfo method, string funcType = null)
     }
 
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    [StructLayout(LayoutKind.Sequential)]
     internal struct Thunk
     {
         public Delegate fn;
@@ -537,4 +537,13 @@ public ThunkInfo(Delegate target)
             Address = Marshal.GetFunctionPointerForDelegate(target);
         }
     }
+
+    [StructLayout(LayoutKind.Sequential)]
+    struct PyMethodDef
+    {
+        public IntPtr ml_name;
+        public IntPtr ml_meth;
+        public int ml_flags;
+        public IntPtr ml_doc;
+    }
 }
diff --git a/src/runtime/metatype.cs b/src/runtime/metatype.cs
@@ -11,17 +11,30 @@ namespace Python.Runtime
     internal class MetaType : ManagedType
     {
         private static IntPtr PyCLRMetaType;
-
+        private static SlotsHolder _metaSlotsHodler;
 
         /// <summary>
         /// Metatype initialization. This bootstraps the CLR metatype to life.
         /// </summary>
         public static IntPtr Initialize()
         {
-            PyCLRMetaType = TypeManager.CreateMetaType(typeof(MetaType));
+            PyCLRMetaType = TypeManager.CreateMetaType(typeof(MetaType), out _metaSlotsHodler);
             return PyCLRMetaType;
         }
 
+        public static void Release()
+        {
+            if (PyCLRMetaType == IntPtr.Zero)
+            {
+                throw new ObjectDisposedException("PyCLRMetaType");
+            }
+            if (Runtime.Refcount(PyCLRMetaType) > 1)
+            {
+                _metaSlotsHodler.ResetSlots();
+            }
+            Runtime.Py_CLEAR(ref PyCLRMetaType);
+            _metaSlotsHodler = null;
+        }
 
         /// <summary>
         /// Metatype __new__ implementation. This is called to create a new

diff --git a/src/runtime/methodwrapper.cs b/src/runtime/methodwrapper.cs
@@ -13,7 +13,6 @@ internal class MethodWrapper
         public IntPtr mdef;
         public IntPtr ptr;
         private bool _disposed = false;
-
         private ThunkInfo _thunk;
 
         public MethodWrapper(Type type, string name, string funcType = null)

diff --git a/src/runtime/runtime.cs b/src/runtime/runtime.cs
@@ -211,6 +211,7 @@ internal static void Initialize(bool initSigs = false)
             PyNone = PyObject_GetAttrString(op, "None");
             PyTrue = PyObject_GetAttrString(op, "True");
             PyFalse = PyObject_GetAttrString(op, "False");
+            PySuper_Type = PyObject_GetAttrString(op, "super");
 
             PyBoolType = PyObject_Type(PyTrue);
             PyNoneType = PyObject_Type(PyNone);
@@ -380,6 +381,11 @@ internal static void Shutdown()
             Exceptions.Shutdown();
             ImportHook.Shutdown();
             Finalizer.Shutdown();
+
+            TypeManager.RemoveTypes();
+            MetaType.Release();
+            PyCLRMetaType = IntPtr.Zero;
+
             Py_Finalize();
         }
 
@@ -401,6 +407,7 @@ internal static int AtExit()
         internal static IntPtr PyModuleType;
         internal static IntPtr PyClassType;
         internal static IntPtr PyInstanceType;
+        internal static IntPtr PySuper_Type;
         internal static IntPtr PyCLRMetaType;
         internal static IntPtr PyMethodType;
         internal static IntPtr PyWrapperDescriptorType;
@@ -1905,6 +1912,22 @@ internal static IntPtr PyMem_Realloc(IntPtr ptr, long size)
         [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void PyErr_Print();
 
+        internal static void Py_CLEAR(ref IntPtr ob)
+        {
+            XDecref(ob);
+            ob = IntPtr.Zero;
+        }
+
+        //====================================================================
+        // Python Capsules API
+        //====================================================================
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern IntPtr PyCapsule_New(IntPtr pointer, string name, IntPtr destructor);
+
+        [DllImport(_PythonDll, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern IntPtr PyCapsule_GetPointer(IntPtr capsule, string name);
+
 
         //====================================================================
         // Miscellaneous