MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added deprecation warning for settingsmeta fields no longer used.

pull/2287/head
Chris Veilleux 2019-09-09 14:52:41 -05:00 committed by Åke Forslund
parent 0d897cf4e8
commit 9c0c20e96d
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mycroft/skills/settings.py
View File

@ -277,9 +277,14 @@ class SettingsMetaUploader:
get_display_name(self.skill_name) get_display_name(self.skill_name)
) )
) )
# Backwards compatibility: for deprecated in ('color', 'identifier', 'name'):
if 'name' not in self.settings_meta: if deprecated in self.settings_meta:
self.settings_meta.update(name=self.settings_meta['display_name']) log_msg = (
'DEPRECATION WARNING: The "{}" attribute in the '
'settingsmeta file is no longer supported.'
)
LOG.warning(log_msg.format(deprecated))
del(self.settings_meta[deprecated])
def _issue_api_call(self): def _issue_api_call(self):
"""Use the API to send the settings meta to the server.""" """Use the API to send the settings meta to the server."""
@ -369,7 +374,7 @@ class SkillSettingsDownloader:
try: try:
previous_settings = self.last_download_result[skill_gid] previous_settings = self.last_download_result[skill_gid]
except KeyError: except KeyError:
if remote_settings is not None: if remote_settings:
settings_changed = True settings_changed = True
except Exception: except Exception:
LOG.exception('error occurred handling setting change events') LOG.exception('error occurred handling setting change events')
@ -415,7 +420,7 @@ class Settings:
save_settings(self._skill.root_dir, self._settings) save_settings(self._skill.root_dir, self._settings)
def set_changed_callback(self, callback): def set_changed_callback(self, callback):
LOG.warning('DEPRECATED - set the settings_changed_callback attribute') LOG.warning('DEPRECATED - set the settings_change_callback attribute')
self._skill.settings_change_callback = callback self._skill.settings_change_callback = callback
def as_dict(self): def as_dict(self):

1
test/unittests/skills/test_settings.py
View File

@ -138,7 +138,6 @@ class TestSettingsMetaUploader(MycroftUnitTestBase):
expected_settings_meta = dict( expected_settings_meta = dict(
skill_gid='test_skill|99.99', skill_gid='test_skill|99.99',
display_name='Test Skill', display_name='Test Skill',
name='Test Skill'
) )
if skill_settings is not None: if skill_settings is not None:
expected_settings_meta.update(skill_settings) expected_settings_meta.update(skill_settings)