Merge branch 'master' into python3

[wrw.git] / wrw / req.py

diff --git a/wrw/req.py b/wrw/req.py
index 90cfbaa..82a1f84 100644 (file)
--- 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:
@@ -62,7 +62,7 @@ class request(object):
 class origrequest(request):
     def __init__(self, env):
         self.env = env
-        self.method = env["REQUEST_METHOD"]
+        self.method = env["REQUEST_METHOD"].upper()
         self.uriname = env["SCRIPT_NAME"]
         self.filename = env.get("SCRIPT_FILENAME")
         self.uri = env["REQUEST_URI"]
@@ -137,6 +137,7 @@ class copyrequest(request):
         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