Skip to content

[FIX] Schema-only settings in components #2613

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
astaric merged 1 commit into from
Sep 22, 2017
Merged

[FIX] Schema-only settings in components #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Orange/widgets/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -507,9 +507,9 @@ def update_defaults(self, widget):
widget : OWWidget
"""
self.defaults = self.provider.pack(widget)
for name, setting in self.known_settings.items():
for setting, data, _ in self.provider.traverse_settings(data=self.defaults):
if setting.schema_only:
self.defaults.pop(name, None)
data.pop(setting.name, None)
self.write_defaults()

def fast_save(self, widget, name, value):
Expand Down
9 changes: 9 additions & 0 deletions Orange/widgets/tests/test_settings_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,17 +233,25 @@ def test_schema_only_settings(self):
handler.fast_save(widget, 'schema_only_setting', 5)
self.assertEqual(
handler.known_settings['schema_only_setting'].default, None)
handler.fast_save(widget, 'component.schema_only_setting', 5)
self.assertEqual(
handler.known_settings['component.schema_only_setting'].default, "only")

# update_defaults should not update defaults
widget.schema_only_setting = 5
handler.update_defaults(widget)
self.assertEqual(
handler.known_settings['schema_only_setting'].default, None)
widget.component.schema_only_setting = 5
self.assertEqual(
handler.known_settings['component.schema_only_setting'].default, "only")

# pack_data should pack setting
widget.schema_only_setting = 5
widget.component.schema_only_setting = 5
data = handler.pack_data(widget)
self.assertEqual(data['schema_only_setting'], 5)
self.assertEqual(data['component']['schema_only_setting'], 5)

def test_read_defaults_migrates_settings(self):
handler = SettingsHandler()
Expand Down Expand Up @@ -329,6 +337,7 @@ def override_default_settings(self, widget, defaults=None):

class Component:
int_setting = Setting(42)
schema_only_setting = Setting("only", schema_only=True)


class SimpleWidget:
Expand Down