Merge pull request #1423 from gi0baro/master

Updated pyDAL to 16.08

gluon/tests/test_contenttype.py

@@ -11,7 +11,7 @@ from .fix_path import fix_sys_path
 fix_sys_path(__file__)
 
 from gluon.contenttype import contenttype
-from pydal._compat import iteritems
+from gluon._compat import iteritems
 
 class TestContentType(unittest.TestCase):
 

gluon/tests/test_contribs.py

@@ -8,7 +8,7 @@ import os
 from .fix_path import fix_sys_path
 
 fix_sys_path(__file__)
-from pydal._compat import to_bytes
+from gluon._compat import to_bytes
 from gluon.storage import Storage
 from gluon.contrib import fpdf as fpdf
 from gluon.contrib import pyfpdf as pyfpdf

gluon/tests/test_dal.py

@@ -34,7 +34,7 @@ class TestDALSubclass(unittest.TestCase):
         db.close()
 
     def testSerialization(self):
-        from pydal._compat 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')

gluon/tests/test_globals.py

@@ -14,7 +14,7 @@ fix_sys_path(__file__)
 
 from gluon.globals import Request, Response, Session
 from gluon import URL
-from pydal._compat import basestring
+from gluon._compat import basestring
 
 def setup_clean_session():
         request = Request(env={})

gluon/tests/test_html.py

@@ -17,7 +17,7 @@ from gluon.html import STYLE, TABLE, TR, TD, TAG, TBODY, THEAD, TEXTAREA, TFOOT,
 from gluon.storage import Storage
 from gluon.html import XML_pickle, XML_unpickle
 from gluon.html import TAG_pickler, TAG_unpickler
-from pydal._compat import xrange, PY2, to_native
+from gluon._compat import xrange, PY2, to_native
 
 class TestBareHelpers(unittest.TestCase):
 
@@ -676,7 +676,7 @@ class TestBareHelpers(unittest.TestCase):
     # TODO: def test_markdown_serializer(self):
 
     # TODO: def test_markmin_serializer(self):
-    
+
     @unittest.skipIf(not PY2, "Skipping Python 3.x tests for MARKMIN")
     def test_MARKMIN(self):
         # This test pass with python 2.7 but expected to fail under 2.6

gluon/tests/test_languages.py

@@ -15,7 +15,7 @@ from .fix_path import fix_sys_path
 fix_sys_path(__file__)
 
 from gluon import languages
-from pydal._compat import PY2
+from gluon._compat import PY2
 
 MP_WORKING = 0
 try:

gluon/tests/test_router.py

@@ -21,7 +21,7 @@ from gluon.fileutils import abspath
 from gluon.settings import global_settings
 from gluon.http import HTTP
 from gluon.storage import Storage
-from pydal._compat import to_bytes, to_native, PY2
+from gluon._compat import to_bytes, to_native, PY2
 
 logger = None
 oldcwd = None

gluon/tests/test_routes.py

@@ -21,7 +21,7 @@ from gluon.fileutils import abspath
 from gluon.settings import global_settings
 from gluon.http import HTTP
 from gluon.storage import Storage
-from pydal._compat import to_bytes
+from gluon._compat import to_bytes
 
 logger = None
 oldcwd = None

gluon/tests/test_storage.py

@@ -10,7 +10,7 @@ fix_sys_path(__file__)
 
 from gluon.storage import Storage, StorageList, List
 from gluon.http import HTTP
-from pydal._compat import pickle
+from gluon._compat import pickle
 
 
 class TestStorage(unittest.TestCase):

gluon/tests/test_template.py

@@ -66,7 +66,7 @@ class TestTemplate(unittest.TestCase):
     def testWithDummyFileSystem(self):
         from os.path import join as pjoin
         import contextlib
-        from pydal._compat import StringIO
+        from gluon._compat import StringIO
         from gluon.restricted import RestrictedError
 
         @contextlib.contextmanager

gluon/tests/test_tools.py

@@ -22,7 +22,7 @@ from gluon.dal import DAL, Field
 from pydal.objects import Table
 from gluon import tools
 from gluon.tools import Auth, Mail, Recaptcha, Recaptcha2, prettydate, Expose
-from pydal._compat import PY2
+from gluon._compat import PY2
 from gluon.globals import Request, Response, Session
 from gluon.storage import Storage
 from gluon.languages import translator

gluon/tests/test_validators.py

@@ -13,7 +13,7 @@ fix_sys_path(__file__)
 
 
 from gluon.validators import *
-from pydal._compat import PY2, to_bytes
+from gluon._compat import PY2, to_bytes
 
 class TestValidators(unittest.TestCase):
 

gluon/tests/test_web.py

@@ -16,7 +16,7 @@ from .fix_path import fix_sys_path
 fix_sys_path(__file__)
 
 from gluon.contrib.webclient import WebClient
-from pydal._compat import urllib2, PY2
+from gluon._compat import urllib2, PY2
 
 webserverprocess = None