Ticket #16822: rawpostdata.patch

django/http/__init__.py

@@ -127 +127 @@
 
 RAISE_ERROR = object()
 
+class RawPostDataException(Exception):
+    """
+    You cannot access raw_post_data from a request that has
+    multipart/* POST data if it has been accessed via POST,
+    FILES etc..
+    """
+    pass
 
 def build_request_repr(request, path_override=None, GET_override=None,
                        POST_override=None, COOKIES_override=None,
@@ -301 +308 @@
     def _get_raw_post_data(self):
         if not hasattr(self, '_raw_post_data'):
             if self._read_started:
-                raise Exception("You cannot access raw_post_data after reading from request's data stream")
+                raise RawPostDataException("You cannot access raw_post_data after reading from request's data stream")
             self._raw_post_data = self.read()
             self._stream = StringIO(self._raw_post_data)
         return self._raw_post_data

tests/regressiontests/requests/tests.py

@@ -5 +5 @@
 from django.conf import settings
 from django.core.handlers.modpython import ModPythonRequest
 from django.core.handlers.wsgi import WSGIRequest, LimitedStream
-from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_repr
+from django.http import HttpRequest, HttpResponse, parse_cookie, build_request_repr, RawPostDataException
 from django.utils import unittest
 from django.utils.http import cookie_date
 
@@ -314 +314 @@
                                'CONTENT_LENGTH': len(payload),
                                'wsgi.input': StringIO(payload)})
         self.assertEqual(request.read(2), 'na')
-        self.assertRaises(Exception, lambda: request.raw_post_data)
+        self.assertRaises(RawPostDataException, lambda: request.raw_post_data)
         self.assertEqual(request.POST, {})
 
     def test_raw_post_data_after_POST_multipart(self):
@@ -336 +336 @@
                                'CONTENT_LENGTH': len(payload),
                                'wsgi.input': StringIO(payload)})
         self.assertEqual(request.POST, {u'name': [u'value']})
-        self.assertRaises(Exception, lambda: request.raw_post_data)
+        self.assertRaises(RawPostDataException, lambda: request.raw_post_data)
 
     def test_POST_multipart_with_content_length_zero(self):
         """