From: Travis Beauvais <tbeauvais@gmail.com>
Date: Sat, 5 Oct 2013 17:26:15 +0000 (-0700)
Subject: ise items() since iteritems() not in py3
X-Git-Tag: v3.2.0b1~79^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F907%2Fhead;p=thirdparty%2Ftornado.git

ise items() since iteritems() not in py3
---

diff --git a/tornado/httpserver.py b/tornado/httpserver.py
index 50c907416..f6e470807 100755
--- a/tornado/httpserver.py
+++ b/tornado/httpserver.py
@@ -339,7 +339,7 @@ class HTTPConnection(object):
                 self._request.headers.get("Content-Type", ""), data,
                 self._request.body_arguments, self._request.files)
 
-            for k, v in self._request.body_arguments.iteritems():
+            for k, v in self._request.body_arguments.items():
                 self._request.arguments.setdefault(k, []).extend(v)
         self.request_callback(self._request)
 
diff --git a/tornado/wsgi.py b/tornado/wsgi.py
index 069938595..8e5ddedb9 100755
--- a/tornado/wsgi.py
+++ b/tornado/wsgi.py
@@ -177,7 +177,7 @@ class HTTPRequest(object):
         httputil.parse_body_arguments(self.headers.get("Content-Type", ""),
                                       self.body, self.body_arguments, self.files)
 
-        for k, v in self.body_arguments.iteritems():
+        for k, v in self.body_arguments.items():
             self.arguments.setdefault(k, []).extend(v)
 
         self._start_time = time.time()