From 24c53a65aefe00282493fdf0f8c9674bf2b06848 Mon Sep 17 00:00:00 2001 From: Rafael Irgolic Date: Sun, 24 Jan 2021 21:10:57 +0000 Subject: [PATCH] owpythonscript: Remove obsolete dropEvent --- Orange/widgets/data/owpythonscript.py | 7 ------ .../widgets/data/tests/test_owpythonscript.py | 24 ++++--------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/Orange/widgets/data/owpythonscript.py b/Orange/widgets/data/owpythonscript.py index 01ff50e94b3..f9fde092ec6 100644 --- a/Orange/widgets/data/owpythonscript.py +++ b/Orange/widgets/data/owpythonscript.py @@ -698,7 +698,6 @@ def _(color, text): self.consoleBox.setAlignment(Qt.AlignBottom) self.console.setTabStopWidth(4) self.splitCanvas.setSizes([2, 1]) - self.setAcceptDrops(True) self.controlArea.layout().addStretch(10) self._restoreState() @@ -903,12 +902,6 @@ def dragEnterEvent(self, event): # pylint: disable=no-self-use if c is not None: event.acceptProposedAction() - def dropEvent(self, event): - """Handle file drops""" - urls = event.mimeData().urls() - if urls: - self.text.pasteFile(urls[0]) - @classmethod def migrate_settings(cls, settings, version): if version is not None and version < 2: diff --git a/Orange/widgets/data/tests/test_owpythonscript.py b/Orange/widgets/data/tests/test_owpythonscript.py index 9007db55cf2..cc8eede5467 100644 --- a/Orange/widgets/data/tests/test_owpythonscript.py +++ b/Orange/widgets/data/tests/test_owpythonscript.py @@ -174,7 +174,10 @@ def test_script_insert_mime_file(self): url = QUrl.fromLocalFile(fn) mime.setUrls([url]) self.widget.text.insertFromMimeData(mime) - self.assertEqual("test", self.widget.text.toPlainText()) + self.assertEqual( + "'" + fn + "'" + previous, + self.widget.text.toPlainText() + ) self.widget.text.undo() self.assertEqual(previous, self.widget.text.toPlainText()) @@ -201,25 +204,6 @@ def _drag_enter_event(self, url): QPoint(0, 0), Qt.MoveAction, data, Qt.NoButton, Qt.NoModifier) - def test_dropEvent_replaces_file(self): - with named_file("test", suffix=".42") as fn: - previous = self.widget.text.toPlainText() - event = self._drop_event(QUrl.fromLocalFile(fn)) - self.widget.dropEvent(event) - self.assertEqual("test", self.widget.text.toPlainText()) - self.widget.text.undo() - self.assertEqual(previous, self.widget.text.toPlainText()) - - def _drop_event(self, url): - # make sure data does not get garbage collected before it used - # pylint: disable=attribute-defined-outside-init - self.event_data = data = QMimeData() - data.setUrls([QUrl(url)]) - - return QDropEvent( - QPoint(0, 0), Qt.MoveAction, data, - Qt.NoButton, Qt.NoModifier, QDropEvent.Drop) - def test_shared_namespaces(self): widget1 = self.create_widget(OWPythonScript) widget2 = self.create_widget(OWPythonScript)