fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add culture.pl to tags
[wolnelektury.git]
/
apps
/
ajaxable
/
utils.py
diff --git
a/apps/ajaxable/utils.py
b/apps/ajaxable/utils.py
index
4ae6e86
..
2f03309
100755
(executable)
--- a/
apps/ajaxable/utils.py
+++ b/
apps/ajaxable/utils.py
@@
-7,13
+7,13
@@
from django.template import RequestContext
from django.utils.encoding import force_unicode
from django.utils.functional import Promise
from django.utils.http import urlquote_plus
from django.utils.encoding import force_unicode
from django.utils.functional import Promise
from django.utils.http import urlquote_plus
-
from django.utils import simple
json
+
import
json
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.vary import vary_on_headers
from honeypot.decorators import verify_honeypot_value
from django.utils.translation import ugettext_lazy as _
from django.views.decorators.vary import vary_on_headers
from honeypot.decorators import verify_honeypot_value
-class LazyEncoder(
simple
json.JSONEncoder):
+class LazyEncoder(json.JSONEncoder):
def default(self, obj):
if isinstance(obj, Promise):
return force_unicode(obj)
def default(self, obj):
if isinstance(obj, Promise):
return force_unicode(obj)
@@
-24,7
+24,7
@@
class JSONResponse(HttpResponse):
def __init__(self, data={}, callback=None, **kwargs):
# get rid of mimetype
kwargs.pop('mimetype', None)
def __init__(self, data={}, callback=None, **kwargs):
# get rid of mimetype
kwargs.pop('mimetype', None)
- data =
simple
json.dumps(data)
+ data = json.dumps(data)
if callback:
data = callback + "(" + data + ");"
super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
if callback:
data = callback + "(" + data + ");"
super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)