From 87bdc5e4b5a788547764e1c222008a6c7c54232a Mon Sep 17 00:00:00 2001 From: schneefux Date: Thu, 4 Dec 2014 16:56:49 +0100 Subject: Use Python-3-style print function to match coding style This also makes a possible transition to Python 3.x easier --- client/local_mic.py | 2 +- client/modules/MPDControl.py | 6 +++--- client/stt.py | 10 ++++++---- client/vocabcompiler.py | 2 +- jasper.py | 8 ++++---- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/client/local_mic.py b/client/local_mic.py index a58370d..5c0fed2 100644 --- a/client/local_mic.py +++ b/client/local_mic.py @@ -29,4 +29,4 @@ class Mic: return input def say(self, phrase, OPTIONS=None): - print "JASPER: " + phrase + print("JASPER: %s" % phrase) diff --git a/client/modules/MPDControl.py b/client/modules/MPDControl.py index 2548237..ee0904b 100644 --- a/client/modules/MPDControl.py +++ b/client/modules/MPDControl.py @@ -131,10 +131,10 @@ class MusicMode(object): # self.mic.say("Found songs") # self.music.play(songs = songs) - # print "SONG RESULTS" - # print "============" + # print("SONG RESULTS") + # print("============") # for song in songs: - # print "Song: %s Artist: %s" % (song.title, song.artist) + # print("Song: %s Artist: %s" % (song.title, song.artist)) # self.mic.say("Playing %s" % self.music.current_song()) diff --git a/client/stt.py b/client/stt.py index 543a322..9eb07e7 100644 --- a/client/stt.py +++ b/client/stt.py @@ -138,11 +138,13 @@ class PocketSphinxSTT(AbstractSTTEngine): self._logger.debug(line.strip()) f.truncate() - print "===================" - print "JASPER: " + result[0] - print "===================" + transcribed = [result[0]] - return [result[0]] + print("===================") + print("JASPER: %r" % transcribed) + print("===================") + + return transcribed @classmethod def is_available(cls): diff --git a/client/vocabcompiler.py b/client/vocabcompiler.py index 0fb668a..ed9f425 100644 --- a/client/vocabcompiler.py +++ b/client/vocabcompiler.py @@ -388,7 +388,7 @@ if __name__ == '__main__': base_dir = args.base_dir if args.base_dir else tempfile.mkdtemp() phrases = get_all_phrases() - print "Module phrases: %r" % phrases + print("Module phrases: %r" % phrases) for subclass in AbstractVocabulary.__subclasses__(): if hasattr(subclass, 'PATH_PREFIX'): diff --git a/jasper.py b/jasper.py index dbb1c08..ff3eb81 100755 --- a/jasper.py +++ b/jasper.py @@ -113,10 +113,10 @@ class Jasper(object): if __name__ == "__main__": - print "===========================================================" - print " JASPER The Talking Computer " - print " Copyright 2013 Shubhro Saha & Charlie Marsh " - print "===========================================================" + print("===========================================================") + print(" JASPER The Talking Computer ") + print(" Copyright 2013 Shubhro Saha & Charlie Marsh ") + print("===========================================================") logging.basicConfig() logger = logging.getLogger() -- cgit v1.3.1 From 9cf33f640618e9490b29b9297157a613033bff02 Mon Sep 17 00:00:00 2001 From: schneefux Date: Thu, 4 Dec 2014 17:10:41 +0100 Subject: No more prints in STT engines, log them with info instead --- client/stt.py | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/client/stt.py b/client/stt.py index 9eb07e7..86cc83b 100644 --- a/client/stt.py +++ b/client/stt.py @@ -139,11 +139,7 @@ class PocketSphinxSTT(AbstractSTTEngine): f.truncate() transcribed = [result[0]] - - print("===================") - print("JASPER: %r" % transcribed) - print("===================") - + self._logger.info('Transcribed: %r', transcribed) return transcribed @classmethod @@ -398,11 +394,11 @@ class AttSTT(AbstractSTTEngine): exc_info=True) return [] else: - results = [x[0].upper() for x in sorted(results, - key=lambda x: x[1], - reverse=True)] - self._logger.info('Recognized: %r', results) - return results + transcribed = [x[0].upper() for x in sorted(results, + key=lambda x: x[1], + reverse=True)] + self._logger.info('Transcribed: %r', transcribed) + return transcribed def _get_response(self, data): headers = {'authorization': 'Bearer %s' % self.token, -- cgit v1.3.1 From 631d6841a96db0b50fd2ebd2d23dc669fe30afee Mon Sep 17 00:00:00 2001 From: schneefux Date: Thu, 4 Dec 2014 17:15:29 +0100 Subject: Change client.stt loglevel to INFO, so that users can see what was transcribed without having to use --debug --- jasper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/jasper.py b/jasper.py index ff3eb81..1a61981 100755 --- a/jasper.py +++ b/jasper.py @@ -120,6 +120,7 @@ if __name__ == "__main__": logging.basicConfig() logger = logging.getLogger() + logger.getChild("client.stt").setLevel(logging.INFO) if args.debug: logger.setLevel(logging.DEBUG) -- cgit v1.3.1