Ticket #5682: patch_django_5682.diff

django_src/django/http/__init__.py

@@ -20 +20 @@
-class HttpRequest(object):
-    "A basic HTTP request"
-
-
+/PUT
-    _encoding = None
-
-    def __init__(self):
-COOKIES, self.META, self.FILES =
+PUT, self.COOKIES, self.META, self.DATA, self.FILES = {}, {},
-        self.path = ''
-        self.method = None
-
-    def __repr__(self):
-
-COOKIES),
-
+PUT:%s,\n
+PUT), 
+COOKIES), pformat(self.
-
-    def __getitem__(self, key):
-
+, self.PUT
-            if key in d:
-                return d[key]
- or GE
+, GET or PU
-
-    def has_key(self, key):
-
+ or key in self.PUT
-
-    __contains__ = has_key
-
@@ -81 +81 @@
-
-    def _set_encoding(self, val):
-        """
- accesses. If the GET or POS
+/PUT accesses. If the GET, POST or PU
-        dictionary has already been created, it is removed and recreated on the
-        next access (so that it is decoded correctly).
-        """
@@ -90 +90 @@
-            del self._get
-        if hasattr(self, '_post'):
-            del self._post
+        if hasattr(self, '_put'):
+            del self._put
-
-    def _get_encoding(self):
-        return self._encoding
@@ -97 +99 @@
-    encoding = property(_get_encoding, _set_encoding)
-
-def parse_file_upload(header_dict, post_data):
-POST
+DATA
-    import email, email.Message
-    from cgi import parse_header
-    raw_message = '\r\n'.join(['%s:%s' % pair for pair in header_dict.items()])
-    raw_message += '\r\n\r\n' + post_data
-    msg = email.message_from_string(raw_message)
-POST
+DATA
-    FILES = MultiValueDict()
-    for submessage in msg.get_payload():
-        if submessage and isinstance(submessage, email.Message.Message):
@@ -126 +128 @@
-                    'content': submessage.get_payload(),
-                }))
-            else:
-POST
-POST
+DATA
+DATA
-
-class QueryDict(MultiValueDict):
-    """

django_src/django/test/client.py

@@ -218 +218 @@
-
-        return self.request(**r)
-
+    def delete(self, path, data={}, **extra):
+        "Request a response from the server using DELETE."
+        r = {
+            'CONTENT_LENGTH':  None,
+            'CONTENT_TYPE':    'text/html; charset=utf-8',
+            'PATH_INFO':       path,
+            'QUERY_STRING':    urlencode(data, doseq=True),
+            'REQUEST_METHOD': 'DELETE',
+        }
+        r.update(extra)
+
+        return self.request(**r)
+
-    def post(self, path, data={}, content_type=MULTIPART_CONTENT, **extra):
-        "Request a response from the server using POST."
-
@@ -237 +250 @@
-
-        return self.request(**r)
-
+    def put(self, path, data={}, content_type=MULTIPART_CONTENT, **extra):
+        "Request a response from the server using PUT."
+
+        if content_type is MULTIPART_CONTENT:
+            put_data = encode_multipart(BOUNDARY, data)
+        else:
+            put_data = data
+
+        r = {
+            'CONTENT_LENGTH': len(put_data),
+            'CONTENT_TYPE':   content_type,
+            'PATH_INFO':      path,
+            'REQUEST_METHOD': 'PUT',
+            'wsgi.input':     StringIO(put_data),
+        }
+        r.update(extra)
+
+        return self.request(**r)
+
-    def login(self, **credentials):
-        """Set the Client to appear as if it has sucessfully logged into a site.
-

django_src/django/core/handlers/wsgi.py

@@ -91 +91 @@
-        except:
-            post = '<could not parse>'
-        try:
+            put = pformat(self.PUT)
+        except:
+            put = '<could not parse>'
+        try:
-            cookies = pformat(self.COOKIES)
-        except:
-            cookies = '<could not parse>'
@@ -98 +102 @@
-            meta = pformat(self.META)
-        except:
-            meta = '<could not parse>'
-
-
+PUT:%s,\n
+put, 
-
-    def get_full_path(self):
-        return '%s%s' % (self.path, self.environ.get('QUERY_STRING', '') and ('?' + self.environ.get('QUERY_STRING', '')) or '')
@@ -108 +112 @@
-        return 'wsgi.url_scheme' in self.environ \
-            and self.environ['wsgi.url_scheme'] == 'https'
-
-post
-post
-== 'POST'
+data
+data
+in ('POST', 'PUT')
-            if self.environ.get('CONTENT_TYPE', '').startswith('multipart'):
-                header_dict = dict([(k, v) for k, v in self.environ.items() if k.startswith('HTTP_')])
-                header_dict['Content-Type'] = self.environ.get('CONTENT_TYPE', '')
-post
+data
-            else:
-post
+data
-        else:
-post
+data
-
+    def _load_post_and_files(self):
+        # Populates self._post, preserve backward compatibility.
+        if not hasattr(self, '_data'):
+            self._load_data_and_files()
+        self._post = self._data
+
-    def _get_request(self):
-        if not hasattr(self, '_request'):
-
+PUT, self.
-        return self._request
-
-    def _get_get(self):
@@ -136 +146 @@
-
-    def _get_post(self):
-        if not hasattr(self, '_post'):
-load_post_and_files()
+post = self.DATA
-        return self._post
-
-    def _set_post(self, post):
-        self._post = post
-
+    def _get_put(self):
+        if not hasattr(self, '_put'):
+            self._put = self.DATA
+        return self._put
+
+    def _set_put(self, put):
+        self._put = put
+
-    def _get_cookies(self):
-        if not hasattr(self, '_cookies'):
-            self._cookies = http.parse_cookie(self.environ.get('HTTP_COOKIE', ''))
@@ -152 +170 @@
-
-    def _get_files(self):
-        if not hasattr(self, '_files'):
-post
+data
-        return self._files
-
+    def _get_data(self):
+        if not hasattr(self, '_data'):
+            self._load_data_and_files()
+        return self._data
+
-    def _get_raw_post_data(self):
-        try:
-            return self._raw_post_data
@@ -174 +197 @@
-
-    GET = property(_get_get, _set_get)
-    POST = property(_get_post, _set_post)
+    PUT = property(_get_put, _set_put)
-    COOKIES = property(_get_cookies, _set_cookies)
-    FILES = property(_get_files)
+    DATA = property(_get_data)
-    REQUEST = property(_get_request)
-    raw_post_data = property(_get_raw_post_data)
-
+
-class WSGIHandler(BaseHandler):
-    initLock = Lock()
-    request_class = WSGIRequest