fix iteritems, enabled test_cache & test_dal for 3.5

2016-06-02 17:21:36 +02:00
parent 707330accd
commit db8306b5c4
10 changed files with 27 additions and 25 deletions
@@ -30,6 +30,7 @@ from gluon.globals import Request, Response, Session
 from gluon.storage import Storage, List
 from gluon.admin import w2p_unpack
 from pydal.base import BaseAdapter
+from gluon._compat import iteritems

 logger = logging.getLogger("web2py")

@@ -146,7 +147,7 @@ def env(
        path_info = '%s/%s' % (path_info, '/'.join(request.args))
    if request.vars:
        vars = ['%s=%s' % (k, v) if v else '%s' % k
-                for (k, v) in request.vars.iteritems()]
+                for (k, v) in iteritems(request.vars)]
        path_info = '%s?%s' % (path_info, '&'.join(vars))
    request.env.path_info = path_info