Change the way of retrieveing scikit args for learners

biolab · May 18, 2020 · 47f4cd9 · 47f4cd9
1 parent 1367b1e
commit 47f4cd9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/Orange/base.py b/Orange/base.py
@@ -520,11 +520,14 @@ def params(self, value):
     def _get_sklparams(self, values):
         skllearner = self.__wraps__
         if skllearner is not None:
-            spec = inspect.getargs(skllearner.__init__.__code__)
+            spec = list(
+                inspect.signature(skllearner.__init__).parameters.keys()
+            )
             # first argument is 'self'
-            assert spec.args[0] == "self"
-            params = {name: values[name] for name in spec.args[1:]
-                      if name in values}
+            assert spec[0] == "self"
+            params = {
+                name: values[name] for name in spec[1:] if name in values
+            }
         else:
             raise TypeError("Wrapper does not define '__wraps__'")
         return params

diff --git a/Orange/projection/base.py b/Orange/projection/base.py
@@ -196,11 +196,14 @@ def params(self, value):
     def _get_sklparams(self, values):
         sklprojection = self.__wraps__
         if sklprojection is not None:
-            spec = inspect.getargs(sklprojection.__init__.__code__)
+            spec = list(
+                inspect.signature(sklprojection.__init__).parameters.keys()
+            )
             # first argument is 'self'
-            assert spec.args[0] == "self"
-            params = {name: values[name] for name in spec.args[1:]
-                      if name in values}
+            assert spec[0] == "self"
+            params = {
+                name: values[name] for name in spec[1:] if name in values
+            }
         else:
             raise TypeError("Wrapper does not define '__wraps__'")
         return params