summaryrefslogtreecommitdiff
path: root/client/modules/Joke.py
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-10-06 16:59:36 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2014-10-06 16:59:36 +0200
commitedca8b7407d7c9b1497ba1722d1b66ffa4b4c234 (patch)
treed544987379415ac557751401ea0b0c7de81530b7 /client/modules/Joke.py
parent890a5798fcf7f9b9dc06529aa4bc7fe903d7ca1a (diff)
parent804da384bff556d3caedf9ad01d57f2460aee151 (diff)
downloadjasper-client-edca8b7407d7c9b1497ba1722d1b66ffa4b4c234.tar.gz
jasper-client-edca8b7407d7c9b1497ba1722d1b66ffa4b4c234.zip
Merge pull request #217 from Holzhaus/style-fixes
Style fixes
Diffstat (limited to 'client/modules/Joke.py')
-rw-r--r--client/modules/Joke.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/client/modules/Joke.py b/client/modules/Joke.py
index c560f4e..7192b03 100644
--- a/client/modules/Joke.py
+++ b/client/modules/Joke.py
@@ -6,7 +6,7 @@ import jasperpath
WORDS = ["JOKE", "KNOCK KNOCK"]
-def getRandomJoke(filename=jasperpath.data('text','JOKES.txt')):
+def getRandomJoke(filename=jasperpath.data('text', 'JOKES.txt')):
jokeFile = open(filename, "r")
jokes = []
start = ""
@@ -38,7 +38,8 @@ def handle(text, mic, profile):
Arguments:
text -- user-input, typically transcribed speech
mic -- used to interact with the user (for both input and output)
- profile -- contains information related to the user (e.g., phone number)
+ profile -- contains information related to the user (e.g., phone
+ number)
"""
joke = getRandomJoke()