Changeset 5342

Timestamp:

05/25/07 04:48:02 (1 year ago)

Author:

mtredinnick

Message:

unicode: Added a more convenient way to set/change the encoding on a request
instance.

Files:

• django/branches/unicode/django/core/handlers/modpython.py (modified) (2 diffs)
• django/branches/unicode/django/core/handlers/wsgi.py (modified) (2 diffs)
• django/branches/unicode/django/http/__init__.py (modified) (2 diffs)
• django/branches/unicode/docs/unicode.txt (modified) (1 diff)

django/branches/unicode/django/core/handlers/modpython.py

@@ -50 +50 @@
-            self._post, self._files = http.parse_file_upload(self._req.headers_in, self.raw_post_data)
-        else:
-
+, encoding=self._encoding
-
-    def _get_request(self):
@@ -59 +59 @@
-    def _get_get(self):
-        if not hasattr(self, '_get'):
-
+, encoding=self._encoding
-        return self._get
-

django/branches/unicode/django/core/handlers/wsgi.py

@@ -114 +114 @@
-                self._post, self._files = http.parse_file_upload(header_dict, self.raw_post_data)
-            else:
-
+, encoding=self._encoding
-        else:
-
+, encoding=self._encoding
-
-    def _get_request(self):
@@ -126 +126 @@
-        if not hasattr(self, '_get'):
-            # The WSGI spec says 'QUERY_STRING' may be absent.
-
+, encoding=self._encoding
-        return self._get
-

django/branches/unicode/django/http/__init__.py

@@ -19 +19 @@
-class HttpRequest(object):
-    "A basic HTTP request"
+
+    # The encoding used in GET/POST dicts. None means use default setting.
+    _encoding = None
+
-    def __init__(self):
-        self.GET, self.POST, self.COOKIES, self.META, self.FILES = {}, {}, {}, {}, {}
@@ -43 +47 @@
-    def is_secure(self):
-        return os.environ.get("HTTPS") == "on"
+
+    def _set_encoding(self, val):
+        """
+        Sets the encoding used for GET/POST accesses.
+        """
+        self._encoding = val
+        if hasattr(self, '_get'):
+            self.GET.encoding = val
+        if hasattr(self, '_post'):
+            self.POST.encoding = val
+
+    def _get_encoding(self):
+        return self._encoding
+
+    encoding = property(_get_encoding, _set_encoding)
-
-def parse_file_upload(header_dict, post_data):

django/branches/unicode/docs/unicode.txt

@@ -338 +338 @@
-for form data. If you need to change this for a particular form, you can set
-the ``encoding`` attribute on the ``GET`` and ``POST`` data structures. For
-
+
+
-
-    def some_view(request):
-        # We know that the data must be encoded as KOI8-R (for some reason).
-
-
+
-        ...
+
+You can even change the encoding after having accessed ``request.GET`` or
+``request.POST`` and all subsequent accesses will use the new encoding.
-
-It will typically be very rare that you would need to worry about changing the