owcalibratedlearner: Never return base_learner instance from create_l…

…earner

The instance's name is modified in place after.

Replace IdentityWrapper (which did not work) with copy.deepcopy of the instance.

Orange/widgets/model/owcalibratedlearner.py

@@ -1,3 +1,5 @@
+import copy
+
 from Orange.classification import CalibratedLearner, ThresholdLearner, \
     NaiveBayesLearner
 from Orange.data import Table
@@ -65,7 +67,6 @@ def set_learner(self, learner):
         self.learner = self.model = None
 
     def _set_default_name(self):
-
         if self.base_learner is None:
             self.set_default_learner_name("")
         else:
@@ -80,10 +81,6 @@ def calibration_options_changed(self):
         self.apply()
 
     def create_learner(self):
-        class IdentityWrapper(Learner):
-            def fit_storage(self, data):
-                return self.base_learner.fit_storage(data)
-
         if self.base_learner is None:
             return None
         learner = self.base_learner
@@ -95,8 +92,11 @@ def fit_storage(self, data):
                                        self.ThresholdMap[self.threshold])
         if self.preprocessors:
             if learner is self.base_learner:
-                learner = IdentityWrapper()
+                learner = copy.deepcopy(learner)
             learner.preprocessors = (self.preprocessors, )
+        if learner is self.base_learner:
+            learner = copy.deepcopy(learner)
+        assert learner is not self.base_learner
         return learner
 
     def get_learner_parameters(self):

Orange/widgets/model/tests/test_owcalibratedlearner.py

@@ -95,7 +95,7 @@ def test_create_learner(self):
         widget.calibration = widget.NoCalibration
         widget.threshold = widget.NoThresholdOptimization
         learner = self.widget.create_learner()
-        self.assertIs(learner, self.widget.base_learner)
+        self.assertIsNot(learner, self.widget.base_learner)
 
         widget.calibration = widget.SigmoidCalibration
         widget.threshold = widget.OptimizeF1