fixed import error

gluon/cache.py

@@ -39,7 +39,7 @@ try:
 except ImportError:
     have_settings = False
 
-from pydal import portalocker
+from pydal.contrib import portalocker
 from pydal._compat import pickle, thread, to_bytes, to_native, hashlib_md5
 
 try:

gluon/globals.py

@@ -28,7 +28,7 @@ from gluon import recfile
 from gluon.cache import CacheInRam
 from gluon.fileutils import copystream
 import hashlib
-from pydal import portalocker
+from pydal.contrib import portalocker
 from pickle import Pickler, MARK, DICT, EMPTY_DICT
 #from types import DictionaryType
 import datetime

gluon/languages.py

@@ -22,7 +22,7 @@ from gluon.utf8 import Utf8
 from local_html_escape import local_html_escape
 
 from pydal._compat import copyreg, PY2, maketrans, iterkeys, unicodeT, to_unicode, to_bytes, iteritems, to_native, pjoin
-from pydal.portalocker import read_locked, LockedFile
+from pydal.contrib.portalocker import read_locked, LockedFile
 
 from gluon.fileutils import listdir
 from gluon.cfs import getcfs

gluon/newcron.py

@@ -26,7 +26,7 @@ try:
 except:
     import pickle
 from gluon.settings import global_settings
-from pydal import portalocker
+from pydal.contrib import portalocker
 
 logger = logging.getLogger("web2py.cron")
 _cron_stopping = False

gluon/storage.py

@@ -12,7 +12,7 @@ Provides:
 - Storage; like dictionary allowing also for `obj.foo` for `obj['foo']`
 """
 
-from pydal import portalocker
+from pydal.contrib import portalocker
 from pydal._compat import copyreg, pickle, PY2
 
 __all__ = ['List', 'Storage', 'Settings', 'Messages',