fix unicode decode error

AIRPLAYZ · Dec 22, 2011 · 11c7f0c · 11c7f0c
1 parent 64bb580
commit 11c7f0c
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/api.py b/api.py
@@ -40,8 +40,12 @@
 
 class ApiHandler(webapp.RequestHandler):
     def write(self, output):
+        if output is None:
+            output = ''
         callback = self.request.get('callback', None)
         if callback:
+            if not isinstance(output, unicode):
+                output = output.decode('utf-8')
             self.response.headers['Content-type'] = 'application/javascript'
             output = '%s(%s)' % (callback, output)
         else: