Ticket #17371: 17371-wip.patch

django/test/client.py

@@ -275 +275 @@
         return self.request(**r)
 
     def options(self, path, data={}, **extra):
-        "Constrict an OPTIONS request"
+        "Construct an OPTIONS request"
+        return self.generic('OPTIONS', path, data, content_type, **extra)
 
-        parsed = urlparse(path)
-        r = {
-            'PATH_INFO':       self._get_path(parsed),
-            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],
-            'REQUEST_METHOD': 'OPTIONS',
-        }
-        r.update(extra)
-        return self.request(**r)
-
-    def put(self, path, data={}, content_type=MULTIPART_CONTENT,
-            **extra):
+    def put(self, path, data='', content_type=MULTIPART_CONTENT, **extra):
         "Construct a PUT request."
+        return self.generic('PUT', path, data, content_type, **extra)
 
-        put_data = self._encode_data(data, content_type)
+    def delete(self, path, data='', content_type=MULTIPART_CONTENT, **extra):
+        "Construct a DELETE request."
+        return self.generic('DELETE', path, data, content_type, **extra)
 
+    def generic(self, method, path, data='', content_type=MULTIPART_CONTENT,
+                **extra):
         parsed = urlparse(path)
         r = {
-            'CONTENT_LENGTH': len(put_data),
-            'CONTENT_TYPE':   content_type,
             'PATH_INFO':      self._get_path(parsed),
             'QUERY_STRING':   parsed[4],
-            'REQUEST_METHOD': 'PUT',
-            'wsgi.input':     FakePayload(put_data),
+            'REQUEST_METHOD': method,
         }
+        if data:
+            r.update({
+                'CONTENT_LENGTH': len(data),
+                'CONTENT_TYPE':   content_type,
+                'wsgi.input':     FakePayload(data),
+            })
         r.update(extra)
         return self.request(**r)
 
-    def delete(self, path, data={}, **extra):
-        "Construct a DELETE request."
-
-        parsed = urlparse(path)
-        r = {
-            'PATH_INFO':       self._get_path(parsed),
-            'QUERY_STRING':    urlencode(data, doseq=True) or parsed[4],
-            'REQUEST_METHOD': 'DELETE',
-        }
-        r.update(extra)
-        return self.request(**r)
-
-
 class Client(RequestFactory):
     """
     A class that can act as a client for testing purposes.