Changeset 775

Timestamp:

11/01/05 15:04:36

Author:

fumanchu

Message:

Moved _cphttptools.KeyTitlingDict? to lib.cptools.HeaderMap?.

Files:

• trunk/cherrypy/_cphttptools.py (modified) (3 diffs)
• trunk/cherrypy/lib/cptools.py (modified) (1 diff)

trunk/cherrypy/_cphttptools.py

@@ -69 +69 @@
-
-
-class KeyTitlingDict(dict):
-    
-    """A dict subclass which changes each key to str(key).title()
-    
-    This allows headers to be case-insensitive and avoid duplicates.
-    """
-    
-    def __getitem__(self, key):
-        return dict.__getitem__(self, str(key).title())
-    
-    def __setitem__(self, key, value):
-        dict.__setitem__(self, str(key).title(), value)
-    
-    def __delitem__(self, key):
-        dict.__delitem__(self, str(key).title())
-    
-    def __contains__(self, item):
-        return dict.__contains__(self, str(item).title())
-    
-    def get(self, key, default=None):
-        return dict.get(self, str(key).title(), default)
-    
-    def has_key(self, key):
-        return dict.has_key(self, str(key).title())
-    
-    def update(self, E):
-        for k in E.keys():
-            self[str(k).title()] = E[k]
-    
-    def fromkeys(cls, seq, value=None):
-        newdict = cls()
-        for k in seq:
-            newdict[str(k).title()] = value
-        return newdict
-    fromkeys = classmethod(fromkeys)
-    
-    def setdefault(self, key, x=None):
-        key = str(key).title()
-        try:
-            return self[key]
-        except KeyError:
-            self[key] = x
-            return x
-    
-    def pop(self, key, default):
-        return dict.pop(self, str(key).title(), default)
-
-
-class Request(object):
-    """An HTTP request."""
@@ -160 +112 @@
-        try:
-            self.headers = headers
-KeyTitlingDict
+cptools.HeaderMap
-            self.simpleCookie = Cookie.SimpleCookie()
-            self.rfile = rfile
@@ -473 +425 @@
-        self.body = None
-        
-KeyTitlingDict
+cptools.HeaderMap
-        self.headerMap.update({
-            "Content-Type": "text/html",

trunk/cherrypy/lib/cptools.py

@@ -487 +487 @@
-
-
+class HeaderMap(dict):
+    """A dict subclass for HTTP request and response headers.
+    
+    Each key is changed on entry to str(key).title(). This allows headers
+    to be case-insensitive and avoid duplicates.
+    """
+    
+    def __getitem__(self, key):
+        return dict.__getitem__(self, str(key).title())
+    
+    def __setitem__(self, key, value):
+        dict.__setitem__(self, str(key).title(), value)
+    
+    def __delitem__(self, key):
+        dict.__delitem__(self, str(key).title())
+    
+    def __contains__(self, item):
+        return dict.__contains__(self, str(item).title())
+    
+    def get(self, key, default=None):
+        return dict.get(self, str(key).title(), default)
+    
+    def has_key(self, key):
+        return dict.has_key(self, str(key).title())
+    
+    def update(self, E):
+        for k in E.keys():
+            self[str(k).title()] = E[k]
+    
+    def fromkeys(cls, seq, value=None):
+        newdict = cls()
+        for k in seq:
+            newdict[str(k).title()] = value
+        return newdict
+    fromkeys = classmethod(fromkeys)
+    
+    def setdefault(self, key, x=None):
+        key = str(key).title()
+        try:
+            return self[key]
+        except KeyError:
+            self[key] = x
+            return x
+    
+    def pop(self, key, default):
+        return dict.pop(self, str(key).title(), default)