X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Freq.py;h=0348c8107d2d8fccd348469cba7a305aae3527cc;hb=920b69c320cb0dc83eec0c8b4397c7a5b80b7d5b;hp=f3dc31f10d93528d639f423b5f4e976145ef2971;hpb=b409a33843abb3221edd27016558c39cf33a6510;p=wrw.git

diff --git a/wrw/req.py b/wrw/req.py
index f3dc31f..0348c81 100644
--- a/wrw/req.py
+++ b/wrw/req.py
@@ -17,7 +17,7 @@ class headdict(object):
         del self.dict[key.lower()]
 
     def __iter__(self):
-        return iter((list[0] for list in self.dict.itervalues()))
+        return iter((list[0] for list in self.dict.values()))
     
     def get(self, key, default = ""):
         if key.lower() in self.dict:
@@ -50,8 +50,19 @@ def fixcase(str):
     return str
 
 class request(object):
+    def copy(self):
+        return copyrequest(self)
+
+    def shift(self, n):
+        new = self.copy()
+        new.uriname = self.uriname + self.pathinfo[:n]
+        new.pathinfo = self.pathinfo[n:]
+        return new
+
+class origrequest(request):
     def __init__(self, env):
         self.env = env
+        self.method = env["REQUEST_METHOD"].upper()
         self.uriname = env["SCRIPT_NAME"]
         self.filename = env.get("SCRIPT_FILENAME")
         self.uri = env["REQUEST_URI"]
@@ -59,6 +70,7 @@ class request(object):
         self.query = env["QUERY_STRING"]
         self.remoteaddr = env["REMOTE_ADDR"]
         self.serverport = env["SERVER_PORT"]
+        self.servername = env["SERVER_NAME"]
         self.https = "HTTPS" in env
         self.ihead = headdict()
         self.ohead = headdict()
@@ -117,3 +129,38 @@ class request(object):
             for val in self.ohead.getlist(nm):
                 hdrs.append((nm, val))
         startreq("%s %s" % self.statuscode, hdrs)
+
+    def topreq(self):
+        return self
+
+class copyrequest(request):
+    def __init__(self, p):
+        self.parent = p
+        self.top = p.topreq()
+        self.env = p.env
+        self.method = p.method
+        self.uriname = p.uriname
+        self.filename = p.filename
+        self.uri = p.uri
+        self.pathinfo = p.pathinfo
+        self.query = p.query
+        self.remoteaddr = p.remoteaddr
+        self.serverport = p.serverport
+        self.https = p.https
+        self.ihead = p.ihead
+        self.ohead = p.ohead
+
+    def status(self, code, msg):
+        return self.parent.status(code, msg)
+
+    def item(self, id):
+        return self.top.item(id)
+
+    def withres(self, res):
+        return self.top.withres(res)
+
+    def oncommit(self, fn):
+        return self.top.oncommit(fn)
+
+    def topreq(self):
+        return self.parent.topreq()