Changeset 8215 for django/branches/gis/django/http/__init__.py

Timestamp:

08/05/08 12:15:33 (5 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/http/__init__.py (modified) (3 diffs)

django/branches/gis/django/http/__init__.py

@@ -32 +32 @@
-        self.GET, self.POST, self.COOKIES, self.META, self.FILES = {}, {}, {}, {}, {}
-        self.path = ''
+        self.path_info = ''
-        self.method = None
-
@@ -38 +39 @@
-            (pformat(self.GET), pformat(self.POST), pformat(self.COOKIES),
-            pformat(self.META))
-
-    def __getitem__(self, key):
-        for d in (self.POST, self.GET):
-            if key in d:
-                return d[key]
-        raise KeyError, "%s not found in either POST or GET" % key
-
-    def has_key(self, key):
-        return key in self.GET or key in self.POST
-
-    __contains__ = has_key
-
-    def get_host(self):
@@ -443 +433 @@
-    else:
-        return s
+