From eebf406d97c8cb23d7892c5f259cf31d9a1a1cb1 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Mon, 1 Aug 2016 04:13:32 -0500
Subject: [PATCH] fixed import error

---
 gluon/cache.py     | 2 +-
 gluon/globals.py   | 2 +-
 gluon/languages.py | 2 +-
 gluon/newcron.py   | 2 +-
 gluon/storage.py   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gluon/cache.py b/gluon/cache.py
index d9cfa061..da38e5a0 100644
--- a/gluon/cache.py
+++ b/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:
diff --git a/gluon/globals.py b/gluon/globals.py
index b0c70357..ff0cbf52 100644
--- a/gluon/globals.py
+++ b/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
diff --git a/gluon/languages.py b/gluon/languages.py
index dd3d912f..50cfa6d7 100644
--- a/gluon/languages.py
+++ b/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
diff --git a/gluon/newcron.py b/gluon/newcron.py
index 7cd8549f..0bd1d689 100644
--- a/gluon/newcron.py
+++ b/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
diff --git a/gluon/storage.py b/gluon/storage.py
index 46f16e63..dd5d78f2 100644
--- a/gluon/storage.py
+++ b/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',