DAL imports portalocker from gluon to avoid conflict with another portalocker module

2015-01-21 09:39:09 -05:00
parent 5bc5d0496e
commit d6b4ae828c
1 changed files with 1 additions and 1 deletions
--- 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