Merge branch 'master' of github.com:web2py/web2py

gluon/tests/test_appadmin.py

@@ -4,7 +4,7 @@
 """
     Unit tests for gluon.sqlhtml
 """
-from __future__ import print_function
+
 import os
 import sys
 import unittest

gluon/tests/test_dal.py

@@ -56,7 +56,7 @@ def _prepare_exec_for_file(filename):
     elif os.path.split(filename)[1] == '__init__.py':
         filename = os.path.dirname(filename)
     else:
-        raise 'The file provided (%s) does is not a valid Python file.'
+        raise IOError('The file provided (%s) is not a valid Python file.')
     filename = os.path.realpath(filename)
     dirpath = filename
     while True:

gluon/tests/test_globals.py

@@ -252,11 +252,11 @@ class testResponse(unittest.TestCase):
 
     def test_include_meta(self):
         response = Response()
-        response.meta[u'web2py'] = 'web2py'
+        response.meta['web2py'] = 'web2py'
         response.include_meta()
         self.assertEqual(response.body.getvalue(), '\n<meta name="web2py" content="web2py" />\n')
         response = Response()
-        response.meta[u'meta_dict'] = {u'tag_name':'tag_value'}
+        response.meta['meta_dict'] = {'tag_name':'tag_value'}
         response.include_meta()
         self.assertEqual(response.body.getvalue(), '\n<meta tag_name="tag_value" />\n')
 

gluon/tests/test_router.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 """Unit tests for rewrite.py routers option"""
-from __future__ import print_function
+
 import os
 import unittest
 import tempfile

gluon/tests/test_scheduler.py

@@ -551,12 +551,12 @@ class TestsForSchedulerAPIs(BaseTestScheduler):
         def isnotqueued(result):
             self.assertEqual(result.id, None)
             self.assertEqual(result.uuid, None)
-            self.assertEqual(len(result.errors.keys()) > 0, True)
+            self.assertEqual(len(list(result.errors.keys())) > 0, True)
 
         def isqueued(result):
             self.assertNotEqual(result.id, None)
             self.assertNotEqual(result.uuid, None)
-            self.assertEqual(len(result.errors.keys()), 0)
+            self.assertEqual(len(list(result.errors.keys())), 0)
 
         s = Scheduler(self.db)
         fname = 'foo'

gluon/tests/test_web.py

@@ -3,7 +3,7 @@
 """
     Unit tests for running web2py
 """
-from __future__ import print_function
+
 import sys
 import os
 import unittest