Merge pull request #1587 from VesnaT/owscript

OWPythonScript: Update locals when script is executed

Author: astaric

Orange/widgets/data/owpythonscript.py

@@ -138,6 +138,9 @@ def __init__(self, locals=None, parent=None):
     def setLocals(self, locals):
         self.locals = locals
 
+    def updateLocals(self, locals):
+        self.locals.update(locals)
+
     def interact(self, banner=None):
         try:
             sys.ps1
@@ -460,8 +463,9 @@ def __init__(self):
 
         self.controlBox.layout().addWidget(w)
 
-        gui.auto_commit(self.controlArea, self, "auto_execute", "Execute",
-                        auto_label="Auto Execute")
+        self.execute_button = gui.auto_commit(
+            self.controlArea, self, "auto_execute", "Execute",
+            auto_label="Auto Execute")
 
         self.splitCanvas = QSplitter(Qt.Vertical, self.mainArea)
         self.mainArea.layout().addWidget(self.splitCanvas)
@@ -487,7 +491,7 @@ def __init__(self):
 
         self.consoleBox = gui.vBox(self, 'Console')
         self.splitCanvas.addWidget(self.consoleBox)
-        self.console = PythonConsole(self.__dict__, self)
+        self.console = PythonConsole({}, self)
         self.consoleBox.layout().addWidget(self.console)
         self.console.document().setDefaultFont(QFont(defaultFont))
         self.consoleBox.setAlignment(Qt.AlignBottom)
@@ -636,14 +640,22 @@ def saveScript(self):
             f.write(self.text.toPlainText())
             f.close()
 
+    def initial_locals_state(self):
+        d = dict([(i.name, getattr(self, i.name, None)) for i in self.inputs])
+        d.update(dict([(o.name, None) for o in self.outputs]))
+        return d
+
     def commit(self):
         self._script = str(self.text.toPlainText())
+        lcls = self.initial_locals_state()
+        lcls["_script"] = str(self.text.toPlainText())
+        self.console.updateLocals(lcls)
         self.console.write("\nRunning script:\n")
         self.console.push("exec(_script)")
         self.console.new_prompt(sys.ps1)
         for out in self.outputs:
             signal = out.name
-            self.send(signal, getattr(self, signal, None))
+            self.send(signal, self.console.locals.get(signal, None))
 
 
 if __name__ == "__main__":

Orange/widgets/data/tests/test_owpythonscript.py

@@ -0,0 +1,51 @@
+# Test methods with long descriptive names can omit docstrings
+# pylint: disable=missing-docstring
+from Orange.data import Table
+from Orange.classification import LogisticRegressionLearner
+from Orange.widgets.data.owpythonscript import OWPythonScript
+from Orange.widgets.tests.base import WidgetTest
+
+
+class TestOWPythonScript(WidgetTest):
+    def setUp(self):
+        self.widget = self.create_widget(OWPythonScript)
+        self.iris = Table("iris")
+        self.learner = LogisticRegressionLearner()
+        self.model = self.learner(self.iris)
+
+    def test_inputs(self):
+        """Check widget's inputs"""
+        for _input, data in (("in_data", self.iris),
+                             ("in_learner", self.learner),
+                             ("in_classifier", self.model),
+                             ("in_object", "object")):
+            self.assertEqual(getattr(self.widget, _input), None)
+            self.send_signal(_input, data)
+            self.assertEqual(getattr(self.widget, _input), data)
+            self.send_signal(_input, None)
+            self.assertEqual(getattr(self.widget, _input), None)
+
+    def test_outputs(self):
+        """Check widget's outputs"""
+        for _input, _output, data in (
+                ("in_data", "out_data", self.iris),
+                ("in_learner", "out_learner", self.learner),
+                ("in_classifier", "out_data", self.model),
+                ("in_object", "out_object", "object")):
+            self.widget.text.setPlainText("{} = {}".format(_output, _input))
+            self.send_signal(_input, data)
+            self.assertEqual(self.get_output(_output), data)
+            self.send_signal(_input, None)
+            self.widget.text.setPlainText("print({})".format(_output))
+            self.widget.execute_button.button.click()
+            self.assertEqual(self.get_output(_output), None)
+
+    def test_local_variable(self):
+        """Check if variable remains in locals after removed from script"""
+        self.widget.text.setPlainText("temp = 42\nprint(temp)")
+        self.widget.execute_button.button.click()
+        self.assertIn("42", self.widget.console.toPlainText())
+        self.widget.text.setPlainText("print(temp)")
+        self.widget.execute_button.button.click()
+        self.assertNotIn("NameError: name 'temp' is not defined",
+                         self.widget.console.toPlainText())

Orange/widgets/tests/test_scatterplot_density.py

@@ -10,6 +10,8 @@
 
 
 class TestScatterplotDensity(TestCase):
+    def setUp(self):
+        np.random.seed(1)
 
     def random_data(self, n_grid, n_colors, n_data):
         mx, Mx = 200, 2000