Merge pull request #595 from kvar/master

DAL imports portalocker from gluon to avoid conflict with another portal...
2015-01-21 09:33:11 -06:00
parent 137f6b9640 d6b4ae828c
commit a2f5d1cfc5
1 changed files with 1 additions and 1 deletions
@@ -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