fnp
/
redakcja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Dodanie ignorowania console dla nie posiadajÄ…cych tego obiektu przeglÄ…darek.
[redakcja.git]
/
apps
/
api
/
response.py
diff --git
a/apps/api/response.py
b/apps/api/response.py
index
c140163
..
4675015
100644
(file)
--- a/
apps/api/response.py
+++ b/
apps/api/response.py
@@
-22,8
+22,8
@@
class ResponseObject(object):
elif self._mime == MIME_JSON:
data = json.dumps(body, default=lambda o: repr(o) )
else:
elif self._mime == MIME_JSON:
data = json.dumps(body, default=lambda o: repr(o) )
else:
- data = u"%s\n%s" % (self.MESSAGE, unicode(body))
- data =
data
.encode('utf-8')
+
#
data = u"%s\n%s" % (self.MESSAGE, unicode(body))
+ data =
unicode(body)
.encode('utf-8')
return HttpResponse(content=data, status=self._code, \
content_type=self._mime+'; charset=utf-8' )
return HttpResponse(content=data, status=self._code, \
content_type=self._mime+'; charset=utf-8' )
@@
-49,6
+49,7
@@
class RequestAccepted(ResponseObject):
def django_response(self, ticket_status, ticket_uri):
return ResponseObject.django_response(self, {
def django_response(self, ticket_status, ticket_uri):
return ResponseObject.django_response(self, {
+ 'result': 'accepted',
'status': ticket_status,
'refer_to': ticket_uri })
'status': ticket_status,
'refer_to': ticket_uri })
@@
-73,10
+74,7
@@
class AccessDenied(ResponseObject):
def __init__(self, **kwargs):
ResponseObject.__init__(self, 403, **kwargs)
def __init__(self, **kwargs):
ResponseObject.__init__(self, 403, **kwargs)
-
- def django_response(self, reason):
- return ResponseObject.django_response(self, \
- body={'reason': reason})
+
class EntityNotFound(ResponseObject):
class EntityNotFound(ResponseObject):
@@
-98,9
+96,12
@@
class EntityConflict(ResponseObject):
#
# Server side errors
#
#
# Server side errors
#
-class
NotImplemented
(ResponseObject):
+class
InternalError
(ResponseObject):
def __init__(self, **kwargs):
def __init__(self, **kwargs):
- ResponseObject.__init__(self, 50
1, **kwargs)
+ ResponseObject.__init__(self, 50
0, **kwargs)
+class NotImplemented(ResponseObject):
+ def __init__(self, **kwargs):
+ ResponseObject.__init__(self, 501, **kwargs)
\ No newline at end of file