Compare commits
No commits in common. "377386df46671724384521c5104adaae84eb85cd" and "ccff7572d014a9b2e323b922b3121a94ad378e56" have entirely different histories.
377386df46
...
ccff7572d0
2 changed files with 2 additions and 3 deletions
|
@ -25,7 +25,7 @@ def _to_json(python_object):
|
||||||
return python_object.strftime('%Y-%m-%dT%H:%M:%SZ')
|
return python_object.strftime('%Y-%m-%dT%H:%M:%SZ')
|
||||||
raise TypeError('%s %s is not JSON serializable' % (repr(python_object), type(python_object)))
|
raise TypeError('%s %s is not JSON serializable' % (repr(python_object), type(python_object)))
|
||||||
|
|
||||||
def render_to_json_response(dictionary, content_type="application/json", status=200):
|
def render_to_json_response(dictionary, content_type="text/json", status=200):
|
||||||
indent = None
|
indent = None
|
||||||
if settings.DEBUG:
|
if settings.DEBUG:
|
||||||
content_type = "text/javascript"
|
content_type = "text/javascript"
|
||||||
|
|
|
@ -48,8 +48,7 @@ if settings.DEBUG:
|
||||||
|
|
||||||
#load local urls if present
|
#load local urls if present
|
||||||
try:
|
try:
|
||||||
from local_urls import urlpatterns as local_patterns
|
from local_urls import urlpatterns
|
||||||
urlpatterns += local_patterns
|
|
||||||
except ImportError:
|
except ImportError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue