Added release 0.8.7 details in ChangeLog file

[flowspy] / poller / views.py

diff --git a/poller/views.py b/poller/views.py
index 00ca67c..0e756e9 100644 (file)
--- a/poller/views.py
+++ b/poller/views.py
@@ -4,7 +4,6 @@ from gevent.pool import Pool
 import json
 
 import uuid
-import simplejson
 import datetime
 from django.shortcuts import render_to_response
 from django.template.loader import render_to_string
@@ -16,7 +15,7 @@ from django.http import HttpResponseRedirect
 from django.core.urlresolvers import reverse
 
 
-from flowspy.utils import beanstalkc
+import beanstalkc
 
 import logging
 
@@ -34,7 +33,7 @@ def create_message(body, user):
 
 def json_response(value, **kwargs):
     kwargs.setdefault('content_type', 'text/javascript; charset=UTF-8')
-    return HttpResponse(simplejson.dumps(value), **kwargs)
+    return HttpResponse(json.dumps(value), **kwargs)
 
 class Msgs(object):
     cache_size = 500
@@ -102,7 +101,10 @@ class Msgs(object):
             except:
                 user = None
                 return False
-            cursor[user] = self.user_cursor[user]
+            try:
+                cursor[user] = self.user_cursor[user]
+            except:
+                return HttpResponse(content='', mimetype=None, status=400)
                 
             try:
                 if not isinstance(self.user_cache[user], list):