Merge pull request #3344 from lanzagar/sklimpute

preprocess: Update deprecated sklearn import (Imputer->SimpleImputer)

Author: janezd

Orange/preprocess/preprocess.py

@@ -3,10 +3,10 @@
 ----------
 
 """
+import bottleneck as bn
 import numpy as np
 import scipy.sparse as sp
-import sklearn.preprocessing as skl_preprocessing
-import bottleneck as bn
+from sklearn.impute import SimpleImputer
 
 import Orange.data
 from Orange.data.filter import HasClass
@@ -147,7 +147,7 @@ def __call__(self, data):
 
 
 class SklImpute(Preprocess):
-    __wraps__ = skl_preprocessing.Imputer
+    __wraps__ = SimpleImputer
 
     def __init__(self, strategy='mean'):
         self.strategy = strategy
@@ -156,7 +156,7 @@ def __call__(self, data):
         from Orange.data.sql.table import SqlTable
         if isinstance(data, SqlTable):
             return Impute()(data)
-        imputer = skl_preprocessing.Imputer(strategy=self.strategy)
+        imputer = SimpleImputer(strategy=self.strategy)
         X = imputer.fit_transform(data.X)
         # Create new variables with appropriate `compute_value`, but
         # drop the ones which do not have valid `imputer.statistics_`

Orange/widgets/tests/base.py

@@ -40,7 +40,6 @@
     ANNOTATED_DATA_FEATURE_NAME, ANNOTATED_DATA_SIGNAL_NAME
 )
 from Orange.widgets.utils.owlearnerwidget import OWBaseLearner
-from Orange.widgets.utils.plot import OWPlotGUI
 from Orange.widgets.widget import OWWidget
 
 sip.setdestroyonexit(False)
@@ -146,27 +145,27 @@ def create_widget(self, cls, stored_settings=None, reset_default_settings=True):
         return widget
 
     @staticmethod
-    def reset_default_settings(cls):
+    def reset_default_settings(widget):
         """Reset default setting values for widget
 
         Discards settings read from disk and changes stored by fast_save
 
         Parameters
         ----------
-        cls : OWWidget
+        widget : OWWidget
             widget to reset settings for
         """
-        settings_handler = getattr(cls, "settingsHandler", None)
+        settings_handler = getattr(widget, "settingsHandler", None)
         if settings_handler:
             # Rebind settings handler to get fresh copies of settings
             # in known_settings
-            settings_handler.bind(cls)
+            settings_handler.bind(widget)
             # Reset defaults read from disk
             settings_handler.defaults = {}
             # Reset context settings
             settings_handler.global_contexts = []
 
-    def process_events(self, until: callable=None, timeout=DEFAULT_TIMEOUT):
+    def process_events(self, until: callable = None, timeout=DEFAULT_TIMEOUT):
         """Process Qt events, optionally until `until` returns
         something True-ish.
 
@@ -1084,6 +1083,5 @@ def datasets(cls):
         yield cls.missing_data_2()
         yield cls.missing_data_3()
         yield cls.data_one_column_nans()
-        yield cls.data_one_column_infs()
         yield ds_cls
         yield ds_reg