Convert to python3

Author: ralic

libs/bottle.py

@@ -978,7 +978,7 @@ def _cast(self, out, peek=None):
             new_iter = itertools.chain([first], iout)
         elif isinstance(first, str):
             encoder = lambda x: x.encode(response.charset)
-            new_iter = map(encoder, itertools.chain([first], iout))
+            new_iter = list(map(encoder, itertools.chain([first], iout)))
         else:
             msg = 'Unsupported response type: %s' % type(first)
             return self._cast(HTTPError(500, msg))
@@ -1944,19 +1944,19 @@ def items(self):
             return [(k, v[-1]) for k, v in list(self.dict.items())]
 
         def iterkeys(self):
-            return iter(self.dict.keys())
+            return iter(list(self.dict.keys()))
 
         def itervalues(self):
-            return (v[-1] for v in self.dict.values())
+            return (v[-1] for v in list(self.dict.values()))
 
         def iteritems(self):
-            return ((k, v[-1]) for k, v in self.dict.items())
+            return ((k, v[-1]) for k, v in list(self.dict.items()))
 
         def iterallitems(self):
-            return ((k, v) for k, vl in self.dict.items() for v in vl)
+            return ((k, v) for k, vl in list(self.dict.items()) for v in vl)
 
         def allitems(self):
-            return [(k, v) for k, vl in self.dict.items() for v in vl]
+            return [(k, v) for k, vl in list(self.dict.items()) for v in vl]
 
     def get(self, key, default=None, index=-1, type=None):
         """ Return the most recent value for a key.

libs/cherrypy/_cpcompat.py

@@ -189,7 +189,7 @@ def reversed(x):
 try:
     dict.iteritems
     # Python 2
-    iteritems = lambda d: iter(d.items())
+    iteritems = lambda d: iter(list(d.items()))
     copyitems = lambda d: list(d.items())
 except AttributeError:
     # Python 3
@@ -199,7 +199,7 @@ def reversed(x):
 try:
     dict.iterkeys
     # Python 2
-    iterkeys = lambda d: iter(d.keys())
+    iterkeys = lambda d: iter(list(d.keys()))
     copykeys = lambda d: list(d.keys())
 except AttributeError:
     # Python 3
@@ -209,7 +209,7 @@ def reversed(x):
 try:
     dict.itervalues
     # Python 2
-    itervalues = lambda d: iter(d.values())
+    itervalues = lambda d: iter(list(d.values()))
     copyvalues = lambda d: list(d.values())
 except AttributeError:
     # Python 3

libs/cherrypy/lib/cpstats.py

@@ -605,7 +605,7 @@ def get_dict_collection(self, v, formatting):
         """Return ([headers], [rows]) for the given collection."""
         # E.g., the 'Requests' dict.
         headers = []
-        for record in v.values():
+        for record in list(v.values()):
             for k3 in record:
                 format = formatting.get(k3, missing)
                 if format is None:

libs/cherrypy/test/test_wsgi_ns.py

@@ -57,7 +57,7 @@ class ReplaceResults(WSGIResponse):
 
                     def __next__(this):
                         line = next(this.iter)
-                        for k, v in self.map.items():
+                        for k, v in list(self.map.items()):
                             line = line.replace(k, v)
                         return line
 

libs/cherrypy/wsgiserver/wsgiserver2.py

@@ -2390,7 +2390,7 @@ def get_environ(self):
             env["SERVER_PORT"] = str(req.server.bind_addr[1])
 
         # Request headers
-        for k, v in req.inheaders.items():
+        for k, v in list(req.inheaders.items()):
             env["HTTP_" + k.upper().replace("-", "_")] = v
 
         # CONTENT_TYPE/CONTENT_LENGTH
@@ -2420,7 +2420,7 @@ def get_environ(self):
         req = self.req
         env_10 = WSGIGateway_10.get_environ(self)
         env = dict([(k.decode('ISO-8859-1'), v)
-                   for k, v in env_10.items()])
+                   for k, v in list(env_10.items())])
         env['wsgi.version'] = ('u', 0)
 
         # Request-URI