Skip to content

[FIX] Save data widget crash on no data #3311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
janezd merged 9 commits into from
Oct 25, 2018
Merged

[FIX] Save data widget crash on no data #3311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6ff9a7a
Merge remote-tracking branch 'biolab/master'
golbog Oct 2, 2018
f2421ff
Revert "Fix for crash on empty data, better handling on sparcisity ch…
golbog Oct 12, 2018
211201e
Fix for empty data crash, better handling of sparse data
golbog Oct 12, 2018
b87a2c6
Merge remote-tracking branch 'origin/owsave' into owsave
golbog Oct 12, 2018
9045f49
Merge remote-tracking branch 'biolab/master'
golbog Oct 25, 2018
097c4ee
Removed unmanageable conditions
golbog Oct 25, 2018
bb33f2d
Merge remote-tracking branch 'origin/owsave' into owsave
golbog Oct 25, 2018
b286db3
Improved code
golbog Oct 25, 2018
ec78cad
Added janezd's test and reformat of indent
golbog Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Orange/widgets/data/owsave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,15 +129,18 @@ def dataset(self, data):
self.data = data
self.save.setDisabled(data is None)
self.save_as.setDisabled(data is None)
if data is not None:
self.save_file()
if data is None:
return
Copy link
Contributor

@janezd janezd Oct 24, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

self.data = data? Or, equivalently, self.data = None?


self.controls.filetype.clear()
if self.data.is_sparse():
self.controls.filetype.insertItems(0, [item for item, _, supports_sparse in FILE_TYPES
if supports_sparse])
else:
self.controls.filetype.insertItems(0, [item for item, _, _ in FILE_TYPES])
items = [item for item, _, supports_sparse in FILE_TYPES
if supports_sparse or not data.is_sparse()]
if items != [self.controls.filetype.itemText(i) for i in
range(self.controls.filetype.count())]:
self.controls.filetype.clear()
self.controls.filetype.insertItems(0, items)
self.update_extension()

self.save_file()

def save_file_as(self):
file_name = self.remove_extensions(self.filename) or os.path.join(
Expand Down
33 changes: 32 additions & 1 deletion Orange/widgets/data/tests/test_owsave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Test methods with long descriptive names can omit docstrings
# pylint: disable=missing-docstring
from unittest.mock import patch
from unittest.mock import patch, Mock
import itertools

from Orange.data import Table
Expand Down Expand Up @@ -82,3 +82,34 @@ def choose_file(a, b, c, d, e, fn=filename, w=writer):
with patch("AnyQt.QtWidgets.QFileDialog.getSaveFileName", choose_file):
self.widget.save_file_as()
self.assertEqual(len(Table(filename)), 150)

def test_format_combo(self):
widget = self.widget
filetype = widget.controls.filetype

widget.save_file = Mock()

data = Table("iris")
sparse_data = Table("iris")
sparse_data.is_sparse = Mock(return_value=True)

self.send_signal(widget.Inputs.data, data)
n_nonsparse = filetype.count()

self.send_signal(widget.Inputs.data, sparse_data)
n_sparse = filetype.count()
self.assertGreater(n_nonsparse, n_sparse)

self.send_signal(widget.Inputs.data, sparse_data)
self.assertEqual(filetype.count(), n_sparse)

self.send_signal(widget.Inputs.data, data)
self.assertEqual(filetype.count(), n_nonsparse)

self.send_signal(widget.Inputs.data, None)
self.send_signal(widget.Inputs.data, data)
self.assertEqual(filetype.count(), n_nonsparse)

self.send_signal(widget.Inputs.data, None)
self.send_signal(widget.Inputs.data, sparse_data)
self.assertEqual(filetype.count(), n_sparse)