summaryrefslogtreecommitdiff
path: root/client/modules
diff options
context:
space:
mode:
authorschneefux <schneefux+commit@schneefux.xyz>2014-09-23 19:33:51 +0200
committerschneefux <schneefux+commit@schneefux.xyz>2014-09-23 19:33:51 +0200
commit5b62b6799e0e193debeb33b47c99999697ec7149 (patch)
tree955d4a46119d26395628f6c3c410ff4b19bb7dac /client/modules
parent3a19c26d6d63daf61a7c473bc9ff29d870feeaa2 (diff)
parenteb8ebf8c834beec1198999cf21b9223482db4c43 (diff)
downloadjasper-client-5b62b6799e0e193debeb33b47c99999697ec7149.tar.gz
jasper-client-5b62b6799e0e193debeb33b47c99999697ec7149.zip
Merge pull request #187 from Holzhaus/jasperpath-usage
Use jasperpath for static resources
Diffstat (limited to 'client/modules')
-rw-r--r--client/modules/Joke.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/modules/Joke.py b/client/modules/Joke.py
index 802047c..c560f4e 100644
--- a/client/modules/Joke.py
+++ b/client/modules/Joke.py
@@ -1,11 +1,12 @@
# -*- coding: utf-8-*-
import random
import re
+import jasperpath
WORDS = ["JOKE", "KNOCK KNOCK"]
-def getRandomJoke(filename="../static/text/JOKES.txt"):
+def getRandomJoke(filename=jasperpath.data('text','JOKES.txt')):
jokeFile = open(filename, "r")
jokes = []
start = ""