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

This commit is contained in:
Kristofor Varhus committed 2015-01-21 09:39:09 -05:00
1 parent 5bc5d0496e
commit d6b4ae828c
1 file changed
+1 -1
+1 -1
View File
@@ -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