From 22b2b466e54e60f5542ff8fe218a21f0a07b8fb9 Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Thu, 15 Dec 2011 16:09:58 -0500
Subject: [PATCH] CC-3207: Exception 'latin-1' codec can't encode character
 u'\u2013' in position 32: ordinal not in range(256)

- fixed
---
 python_apps/pypo/install/pypo-initialize.py | 10 +++++-----
 python_apps/pypo/pypofetch.py               |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py
index a70d26b86..d791bf135 100644
--- a/python_apps/pypo/install/pypo-initialize.py
+++ b/python_apps/pypo/install/pypo-initialize.py
@@ -3,8 +3,8 @@ import shutil
 from subprocess import Popen, PIPE
 import sys
 import os
-sys.path.append('/usr/lib/airtime/api_clients/')
-import api_client
+sys.path.append('/usr/lib/airtime/')
+from api_clients import api_client
 from configobj import ConfigObj
 
 if os.geteuid() != 0:
@@ -54,7 +54,7 @@ def generate_liquidsoap_config(ss):
                 temp = "0"
             buffer += temp
         buffer += "\n"
-        fh.write(buffer)
+        fh.write(api_client.encode_to(buffer))
     fh.write("log_file = \"/var/log/airtime/pypo-liquidsoap/<script>.log\"\n");
     fh.close()
     
@@ -93,8 +93,8 @@ try:
 
     #generate liquidsoap config file
     #access the DB and generate liquidsoap.cfg under /etc/airtime/
-    api_client = api_client.api_client_factory(config)
-    ss = api_client.get_stream_setting()
+    ac = api_client.api_client_factory(config)
+    ss = ac.get_stream_setting()
         
     if ss is not None:
         generate_liquidsoap_config(ss)
diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py
index a34ac756e..06d2271bc 100644
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@@ -204,7 +204,7 @@ class PypoFetch(Thread):
                         temp = "0"
                     buffer += temp
                 buffer += "\n"
-                fh.write(buffer)
+                fh.write(api_client.encode_to(buffer))
             fh.write("log_file = \"/var/log/airtime/pypo-liquidsoap/<script>.log\"\n");
             fh.close()
             # restarting pypo.