From d6b4ae828cbca44bb6c1ea45aabc2b768facc0bf Mon Sep 17 00:00:00 2001 From: Kristofor Varhus Date: Wed, 21 Jan 2015 09:39:09 -0500 Subject: [PATCH] DAL imports portalocker from gluon to avoid conflict with another portalocker module --- gluon/dal/_load.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gluon/dal/_load.py b/gluon/dal/_load.py index 5aad2206..d17db18a 100644 --- a/gluon/dal/_load.py +++ b/gluon/dal/_load.py @@ -19,7 +19,7 @@ except (ImportError, SystemError): def web2py_uuid(): return str(uuid.uuid4()) try: - import portalocker + from gluon import portalocker have_portalocker = True except ImportError: portalocker = None