Merge branch 'master' of stigma:platforma

[redakcja.git] / apps / api / response.py

diff --git a/apps/api/response.py b/apps/api/response.py
index c140163..0d38a3a 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:
-            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' )        
@@ -98,9 +98,12 @@ class EntityConflict(ResponseObject):
 #
 # Server side errors
 #
-class NotImplemented(ResponseObject):
+class InternalError(ResponseObject):
 
     def __init__(self, **kwargs):
-        ResponseObject.__init__(self, 501, **kwargs) 
+        ResponseObject.__init__(self, 500, **kwargs)
 
+class NotImplemented(ResponseObject):
 
+    def __init__(self, **kwargs):
+        ResponseObject.__init__(self, 501, **kwargs) 
\ No newline at end of file