Merge pull request #1816 from MycroftAI/feature/order-translation-value

Order results from translate_namedvalues()
pull/1813/head^2
Åke 2018-09-26 21:17:09 +02:00 committed by GitHub
commit 81f174be6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions

View File

@ -13,6 +13,7 @@
# limitations under the License.
#
import imp
import collections
import operator
import sys
import time
@ -603,7 +604,7 @@ class MycroftSkill(object):
"""
delim = delim or ','
result = {}
result = collections.OrderedDict()
if not name.endswith(".value"):
name += ".value"
@ -1049,7 +1050,7 @@ class MycroftSkill(object):
self.bus.emit(Message("mycroft.stop.handled",
{"by": "skill:"+str(self.skill_id)}))
timer.cancel()
except:
except: # noqa
timer.cancel()
LOG.error("Failed to stop skill: {}".format(self.name),
exc_info=True)
@ -1090,7 +1091,7 @@ class MycroftSkill(object):
Message("detach_skill", {"skill_id": str(self.skill_id) + ":"}))
try:
self.stop()
except:
except: # noqa
LOG.error("Failed to stop skill: {}".format(self.name),
exc_info=True)