Fix unicode problems with cStringIO

1 files changed, 22 insertions, 23 deletions

diff --git a/backend/views.py b/backend/views.py
index 26c5c88..54671b3 100644
--- a/backend/views.py
+++ b/backend/views.py
@@ -19,7 +19,6 @@ import os
 import sha
 import time
 import urllib
-import cStringIO
 
 from backend.models import SJLike
 from backend.models import SJRoom
@@ -133,21 +132,20 @@ def user_response_str(request, user=None):
 def videos_response_str(videos):
     """ Return string with list of videos
     """
-    strio = cStringIO.StringIO()
+    out = u""
     for v in videos:
        s = v.settings
        if s.get('removed', 0):
            continue
-       strio.write('VIDEO\t')
-       strio.write('%s\n' % '\t'.join([
+       out += u"VIDEO\t%s\t%s\t%s\t%s\t%s\t%s\n" % (
            str(v.id),
            str(datetime_to_timestamp(v.datetime)),
            str(v.user.id),
            v.user.username,
            s['url'],
-           s['title'],
-       ]))
-    return strio.getvalue()
+           s['title']
+       )
+    return out
 
 def videos_response_list(videos):
     """ Return list of videos
@@ -172,17 +170,18 @@ def videos_response_list(videos):
 def settings_response_str(label, settings):
     """ Return string of settings
     """
-    strio = cStringIO.StringIO()
+    strio = u""
     for key, value in settings.iteritems():
-        strio.write('%s\n' % '\t'.join([label, key, value]))
-    return strio.getvalue()
+        strio+=('%s\n' % '\t'.join([label, key, value]))
+    return strio
 
 def texts_response_str(texts):
     """ Return string of chat messages
     """
-    strio = cStringIO.StringIO()
+    strio = u""
+    out = u""
     for text in texts:
-        strio.write('%d\t%s\t%d\t%d\t%s\t%s\n' % (
+        out += ('%d\t%s\t%d\t%d\t%s\t%s\n' % (
             text.id,
             datetime_to_timestamp(text.datetime),
             text.user.id,
@@ -190,15 +189,15 @@ def texts_response_str(texts):
             text.user.username,
             text.settings.get('text', '')
         ))
-    return strio.getvalue()
+    return out
 
 def likes_response_str(likes):
     """ Return string of likes
     """
-    strio = cStringIO.StringIO()
+    strio = u""
     for like in likes:
-        strio.write('LIKE\t%s\n' % like.user.username)
-    return strio.getvalue()
+        strio+=('LIKE\t%s\n' % like.user.username)
+    return strio
 
 def store_video_youtube(room, user, ytid):
     """
@@ -256,7 +255,7 @@ def store_video_soundcloud(room, user, url):
 def store_media_str(room, user, msg):
     """
     """
-    strio= cStringIO.StringIO()
+    strio= u""
     user_profile = user.get_profile()
     words = msg.split()
     music = None
@@ -281,12 +280,12 @@ def store_media_str(room, user, msg):
             else:
                 continue
             videos = SJContent.objects.filter(id=store_video_youtube(room, user, ytid))
-            strio.write(videos_response_str(videos))
+            strio+=(videos_response_str(videos))
         elif "http://youtu.be/" in word:
             try:
                 ytid = word[16:27]
                 videos = SJContent.objects.filter(id=store_video_youtube(room, user, ytid))
-                strio.write(videos_response_str(videos))
+                strio+=(videos_response_str(videos))
             except:
                 pass
         elif "vimeo.com" in word:
@@ -296,13 +295,13 @@ def store_media_str(room, user, msg):
                     continue
                 vimeoid = match.group(1)
                 videos = SJContent.objects.filter(id=store_video_vimeo(room, user, vimeoid))
-                strio.write(videos_response_str(videos))
+                strio+=(videos_response_str(videos))
             except:
                 pass
         elif "soundcloud.com" in word:
             try:
                 videos = SJContent.objects.filter(id=store_video_soundcloud(room, user, word))
-                strio.write(videos_response_str(videos))
+                strio+=(videos_response_str(videos))
             except:
                 pass
         elif word[-3:] == "mp3":
@@ -318,8 +317,8 @@ def store_media_str(room, user, msg):
         audio = SJContent(room=room, content_type='video', user=user, datetime=datetime.now())
         audio.settings = {'url': image+music, 'title': title, 'thumbnail': ''}
         audio.save()
-        strio.write(videos_response_str([audio]))
-    return strio.getvalue()
+        strio+=(videos_response_str([audio]))
+    return strio
 
 def thraw(settings_text):
     settings = dict()