Merge ~nansari/django-piston:fix-for-SN-1445 into django-piston:master

[Najam Ahmed Ansari]

Removing piston's custom HttpResponseWrapper

The wrapper class was attempting to work around a bug in Django which has since
been fixed, rendering the wrapper unnecessary. Removing the wrapper also fixes
SN-1445.

[Przemysław Suliga (suligap)]

The extra json.dumps() additions you added to tests made me wonder. And I think something like

https://pastebin.canonical.com/p/T85sYPMNbN/ - diff applied to this MP

might be the way to go after all. That wrapper has an original function beyond working around an old django bug. But we can make it use django's auto encoding when needed (as in my diff).

See also a testing comment.

[Najam Ahmed Ansari (nansari)]

Updated based on the feedback.

[Przemysław Suliga (suligap)]

Thanks, +1!

review: Approve

diff --git a/piston/tests.py b/piston/tests.py
index aacce0b..65ecca7 100644
--- a/piston/tests.py
+++ b/piston/tests.py
@@ -187,6 +187,9 @@ class ErrorHandlerTest(TestCase):
 
         self.assertTrue(isinstance(response, HttpResponse), "Expected a response, not: %s"
             % response)
+        error_str = response.content.decode('utf-8')
+        self.assertIn('Method signature does not match', error_str,
+            'Expected underlying exception to be handled')
 
 
     def test_other_error(self):
diff --git a/piston/utils.py b/piston/utils.py
index 8e76718..79b9903 100644
--- a/piston/utils.py
+++ b/piston/utils.py
@@ -53,9 +53,7 @@ class rc_factory(object):
 
         class HttpResponseWrapper(HttpResponse):
             """
-            Wrap HttpResponse and make sure that the internal
-            _is_string/_base_content_is_iter flag is updated when the
-            _set_content method (via the content property) is called
+            Wrap HttpResponse to set _use_emitter appropriately.
             """
             def _set_content(self, content):
                 """
@@ -70,22 +68,12 @@ class rc_factory(object):
                     self._container = content
                     self._use_emitter = True
                 else:
-                    self._container = [content]
+                    HttpResponse.content.fset(self, content)
                     self._use_emitter = False
-                # Django 1.7 and above does not have any custom internals to
-                # define the type of the content
-                if django.VERSION < (1, 7):
-                    self._base_content_is_iter = self._use_emitter
 
-            if django.VERSION >= (1, 5):
-                # HttpResponse._get_content does not exists in Django >= 1.5
-
-                @HttpResponse.content.setter
-                def content(self, content):
-                    self._set_content(content)
-
-            else:
-                content = property(HttpResponse._get_content, _set_content)
+            @HttpResponse.content.setter
+            def content(self, content):
+                self._set_content(content)
 
         return HttpResponseWrapper(r, content_type='text/plain', status=c)