manually adapt few imports

gluon/tests/__init__.py

@@ -1,28 +1,28 @@
 import sys
 
-from test_http import *
-from test_cache import *
-from test_contenttype import *
-from test_compileapp import *
-from test_fileutils import *
-from test_globals import *
-from test_html import *
-from test_is_url import *
-from test_languages import *
-from test_router import *
-from test_recfile import *
-from test_routes import *
-from test_storage import *
-from test_serializers import *
-from test_template import *
-from test_validators import *
-from test_utils import *
-from test_contribs import *
-from test_web import *
-from test_dal import *
-from test_tools import *
-from test_appadmin import *
-from test_scheduler import *
+from .test_http import *
+from .test_cache import *
+from .test_contenttype import *
+from .test_compileapp import *
+from .test_fileutils import *
+from .test_globals import *
+from .test_html import *
+from .test_is_url import *
+from .test_languages import *
+from .test_router import *
+from .test_recfile import *
+from .test_routes import *
+from .test_storage import *
+from .test_serializers import *
+from .test_template import *
+from .test_validators import *
+from .test_utils import *
+from .test_contribs import *
+from .test_web import *
+from .test_dal import *
+from .test_tools import *
+from .test_appadmin import *
+from .test_scheduler import *
 
 if sys.version[:3] == '2.7':
     from test_old_doctests import *

gluon/tests/test_serializers.py

@@ -43,7 +43,7 @@ class TestSerializers(unittest.TestCase):
         json_web2pyfied = [json(obj) for obj in iso_objs]
         self.assertEqual(json_objs, json_web2pyfied)
         # int or long int()ified
-        self.assertEqual(json(1), json(1L))
+        # self.assertEqual(json(1), json(1))
         # decimal stringified
         obj = {'a': decimal.Decimal('4.312312312312')}
         self.assertEqual(json(obj), u'{"a": "4.312312312312"}')

gluon/tests/test_tools.py

@@ -869,7 +869,7 @@ class TestAuth(unittest.TestCase):
         # not deleted
         self.assertFalse(self.auth.del_membership('some_test_group'))
         self.assertEqual(set(self.db.auth_membership(membership_id).as_dict().items()),
-                         set({'group_id': 2L, 'user_id': 1L, 'id': 2L}.items()))  # is not deleted
+                         set({'group_id': 2, 'user_id': 1, 'id': 2}.items()))  # is not deleted
         # deleted
         bart_id = self.db(self.db.auth_user.username == 'bart').select(self.db.auth_user.id).first().id
         self.assertTrue(self.auth.del_membership('some_test_group', user_id=bart_id))