fixed ForbidPythonThreadsAttribute being ignored in certain scenarios (#1815)

filmor · lostmsu · web-flow · commit 4d1e09a0765a · 2022-06-13T14:15:35.000+02:00
Co-authored-by: Victor Nova &lt;lost@losttech.software&gt;
diff --git a/src/runtime/Types/MethodObject.cs b/src/runtime/Types/MethodObject.cs
@@ -27,7 +27,7 @@ internal class MethodObject : ExtensionType
         internal PyString? doc;
         internal MaybeType type;
 
-        public MethodObject(MaybeType type, string name, MethodBase[] info, bool allow_threads = MethodBinder.DefaultAllowThreads)
+        public MethodObject(MaybeType type, string name, MethodBase[] info, bool allow_threads)
         {
             this.type = type;
             this.name = name;
@@ -45,6 +45,11 @@ public MethodObject(MaybeType type, string name, MethodBase[] info, bool allow_t
             binder.allow_threads = allow_threads;
         }
 
+        public MethodObject(MaybeType type, string name, MethodBase[] info)
+            : this(type, name, info, allow_threads: AllowThreads(info))
+        {
+        }
+
         public bool IsInstanceConstructor => name == "__init__";
 
         public MethodObject WithOverloads(MethodBase[] overloads)
@@ -206,5 +211,27 @@ public static NewReference tp_repr(BorrowedReference ob)
             var self = (MethodObject)GetManagedObject(ob)!;
             return Runtime.PyString_FromString($"<method '{self.name}'>");
         }
+
+        static bool AllowThreads(MethodBase[] methods)
+        {
+            bool hasAllowOverload = false, hasForbidOverload = false;
+            foreach (var method in methods)
+            {
+                bool forbidsThreads = method.GetCustomAttribute<ForbidPythonThreadsAttribute>(inherit: false) != null;
+                if (forbidsThreads)
+                {
+                    hasForbidOverload = true;
+                }
+                else
+                {
+                    hasAllowOverload = true;
+                }
+            }
+
+            if (hasAllowOverload && hasForbidOverload)
+                throw new NotImplementedException("All method overloads currently must either allow or forbid Python threads together");
+
+            return !hasForbidOverload;
+        }
     }
 }
