diff options
| author | schneefux <schneefux+commit@schneefux.xyz> | 2014-06-28 15:33:02 -0700 |
|---|---|---|
| committer | schneefux <schneefux+commit@schneefux.xyz> | 2014-06-28 15:33:02 -0700 |
| commit | c5c2f81271b9e835c701d8d0a45503d1ada9a7ff (patch) | |
| tree | ef0dd0aeb0ee40d71ed17e580540d9c8f774eef7 | |
| parent | 366bc8847498dacdb69c7f4b78d7c5fe5406de4d (diff) | |
| parent | 2cc3ff395003eac98b1708c2579d4a544d28a703 (diff) | |
| download | jasper-client-c5c2f81271b9e835c701d8d0a45503d1ada9a7ff.tar.gz jasper-client-c5c2f81271b9e835c701d8d0a45503d1ada9a7ff.zip | |
Merged latest changes.
| -rwxr-xr-x | boot/boot.py | 5 | ||||
| -rwxr-xr-x | client/conversation.py | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/boot/boot.py b/boot/boot.py index 245bd4d..12b60eb 100755 --- a/boot/boot.py +++ b/boot/boot.py @@ -1,9 +1,10 @@ #!/usr/bin/env python import os -import sys +import json import urllib2 -import yaml +import sys + import vocabcompiler import traceback diff --git a/client/conversation.py b/client/conversation.py index 29a8e89..bad5073 100755 --- a/client/conversation.py +++ b/client/conversation.py @@ -26,7 +26,7 @@ class Conversation(object): except: self.mic.say("I'm sorry. It seems that Spotify is not enabled. Please read the documentation to learn how to configure Spotify.") return - + self.mic.say("Please give me a moment, I'm loading your Spotify playlists.") music_mode = MusicMode(self.persona, self.mic) music_mode.handleForever() |