From 3934c771b944e30e278f53be4480c6e5d24643bc Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Fri, 19 Sep 2014 12:30:29 +0200
Subject: Replace JASPER_HOME with jasperpath.APP_PATH + os.pardir

---
 client/g2p.py  | 4 +++-
 client/test.py | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'client')

diff --git a/client/g2p.py b/client/g2p.py
index 276f681..6e308ef 100644
--- a/client/g2p.py
+++ b/client/g2p.py
@@ -5,6 +5,8 @@ import subprocess
 import re
 import yaml
 
+import jasperpath
+
 PHONE_MATCH = re.compile(r'<s> (.*) </s>')
 
 FST_MODEL = None
@@ -18,7 +20,7 @@ if os.path.exists(profile_path):
             FST_MODEL = profile['pocketsphinx']['fst_model']
 
 if not FST_MODEL:
-    FST_MODEL = os.environ['JASPER_HOME'] + "/phonetisaurus/g014b2b.fst"
+    FST_MODEL = os.path.join(jasperpath.APP_PATH, os.pardir, 'phonetisaurus', 'g014b2b.fst')
 
 
 def parseLine(line):
diff --git a/client/test.py b/client/test.py
index a731951..49f3109 100644
--- a/client/test.py
+++ b/client/test.py
@@ -2,14 +2,11 @@
 # -*- coding: utf-8-*-
 import os
 import sys
-
-if os.environ.get('JASPER_HOME') is None:
-    os.environ['JASPER_HOME'] = '/home/pi'
-
 import unittest
 import argparse
 from mock import patch
 from urllib2 import URLError, urlopen
+
 import test_mic
 import vocabcompiler
 import g2p
-- 
cgit v1.3.1