Revert some changes back to dict.items made in a previous patch.

diff --git a/Lib/urllib2.py b/Lib/urllib2.py
index 923ba9c840b7eef1cce24578bc66673324424c30..cf6a80546c0b47790fab50263d30e08f473338f9 100644 (file)
--- a/Lib/urllib2.py
+++ b/Lib/urllib2.py
@@ -193,7 +193,7 @@ class Request:
         self.port = None
         self.data = data
         self.headers = {}
-        for key, value in headers.iteritems():
+        for key, value in headers.items():
             self.add_header(key, value)
 
     def __getattr__(self, attr):
@@ -1021,7 +1021,7 @@ class CacheFTPHandler(FTPHandler):
 
         # then check the size
         if len(self.cache) == self.max_conns:
-            for k, v in self.timeout.iteritems():
+            for k, v in self.timeout.items():
                 if v == self.soonest:
                     del self.cache[k]
                     del self.timeout[k]