Oct 22, 2021 · Oct 22, 2021
diff --git a/src/runtime/interop.cs b/src/runtime/interop.cs
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Reflection;
 using System.Text;

 namespace Python.Runtime
 {
        private string docStr;
    }

    [Serializable]
    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate)]
    internal class PythonMethodAttribute : Attribute
    {
        public PythonMethodAttribute()
        {
        }
    }

    [Serializable]
    [AttributeUsage(AttributeTargets.Method | AttributeTargets.Delegate)]
    internal class ModuleFunctionAttribute : Attribute
diff --git a/src/runtime/typemanager.cs b/src/runtime/typemanager.cs
            Runtime.PyDict_SetItem(dict, PyIdentifier.__module__, mod);
            mod.Dispose();

            InitMethods(dict, impl);

            dict.Dispose();

            // The type has been modified after PyType_Ready has been called
            }
        }

        /// <summary>
        /// Given a dict of a newly allocated Python type object and a managed Type that
        /// implements it, initialize any methods defined by the Type that need
        /// to appear in the Python type __dict__ (based on custom attribute).
        /// </summary>
        private static void InitMethods(BorrowedReference typeDict, Type type)
        {
            Type marker = typeof(PythonMethodAttribute);

            BindingFlags flags = BindingFlags.Public | BindingFlags.Static;
            var addedMethods = new HashSet<string>();

            while (type != null)
            {
                MethodInfo[] methods = type.GetMethods(flags);
                foreach (MethodInfo method in methods)
                {
                    if (!addedMethods.Contains(method.Name))
                    {
                        object[] attrs = method.GetCustomAttributes(marker, false);
                        if (attrs.Length > 0)
                        {
                            string method_name = method.Name;
                            var mi = new MethodInfo[1];
                            mi[0] = method;
                            MethodObject m = new TypeMethod(type, method_name, mi);
                            Runtime.PyDict_SetItemString(typeDict, method_name, m.ObjectReference);
                            m.DecrRefCount();
                            addedMethods.Add(method_name);
                        }
                    }
                }
                type = type.BaseType;
            }
        }


        /// <summary>
        /// Utility method to copy slots from a given type to another type.
        /// </summary>
diff --git a/src/runtime/typemethod.cs b/src/runtime/typemethod.cs
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,7 +4,6 @@
		using System.Diagnostics;
		using System.Runtime.InteropServices;
		using System.Reflection;
		using System.Text;

		namespace Python.Runtime
		{
Expand All		@@ -31,15 +30,6 @@ public string DocString
		private string docStr;
		}

		[Serializable]
		[AttributeUsage(AttributeTargets.Method \| AttributeTargets.Delegate)]
		internal class PythonMethodAttribute : Attribute
		{
		public PythonMethodAttribute()
		{
		}
		}

		[Serializable]
		[AttributeUsage(AttributeTargets.Method \| AttributeTargets.Delegate)]
		internal class ModuleFunctionAttribute : Attribute
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -208,8 +208,6 @@ internal static unsafe PyType CreateType(Type impl)
		Runtime.PyDict_SetItem(dict, PyIdentifier.__module__, mod);
		mod.Dispose();

		InitMethods(dict, impl);

		dict.Dispose();

		// The type has been modified after PyType_Ready has been called
Expand DownExpand Up		@@ -806,43 +804,6 @@ static void InitializeSlot(IntPtr type, int slotOffset, ThunkInfo thunk, SlotsHo
		}
		}

		/// <summary>
		/// Given a dict of a newly allocated Python type object and a managed Type that
		/// implements it, initialize any methods defined by the Type that need
		/// to appear in the Python type __dict__ (based on custom attribute).
		/// </summary>
		private static void InitMethods(BorrowedReference typeDict, Type type)
		{
		Type marker = typeof(PythonMethodAttribute);

		BindingFlags flags = BindingFlags.Public \| BindingFlags.Static;
		var addedMethods = new HashSet<string>();

		while (type != null)
		{
		MethodInfo[] methods = type.GetMethods(flags);
		foreach (MethodInfo method in methods)
		{
		if (!addedMethods.Contains(method.Name))
		{
		object[] attrs = method.GetCustomAttributes(marker, false);
		if (attrs.Length > 0)
		{
		string method_name = method.Name;
		var mi = new MethodInfo[1];
		mi[0] = method;
		MethodObject m = new TypeMethod(type, method_name, mi);
		Runtime.PyDict_SetItemString(typeDict, method_name, m.ObjectReference);
		m.DecrRefCount();
		addedMethods.Add(method_name);
		}
		}
		}
		type = type.BaseType;
		}
		}


		/// <summary>
		/// Utility method to copy slots from a given type to another type.
		/// </summary>
Expand Down