fix iteritems, enabled test_cache & test_dal for 3.5

gluon/tests/__init__.py

@@ -6,10 +6,11 @@ from .test_fileutils import *
 from .test_globals import *
 from .test_recfile import *
 from .test_storage import *
+from .test_dal import *
+from .test_cache import *
 
 
 if sys.version[:3] == '2.7':
-    from .test_cache import *
     from .test_compileapp import *
     from .test_html import *
     from .test_is_url import *
@@ -20,7 +21,6 @@ if sys.version[:3] == '2.7':
     from .test_template import *
     from .test_validators import *
     from .test_utils import *
-    from .test_dal import *
     from .test_tools import *
     from .test_appadmin import *
     from .test_scheduler import *

gluon/tests/test_dal.py

@@ -34,7 +34,7 @@ class TestDALSubclass(unittest.TestCase):
         db.close()
 
     def testSerialization(self):
-        import pickle
+        from gluon._compat import pickle
         db = DAL(check_reserved=['all'])
         db.define_table('t_a', Field('f_a'))
         db.t_a.insert(f_a='test')