dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made contrib.pbkdf2 optionional for utils

Browse Source
This commit is contained in:
mdipierro
2012-09-30 13:47:49 -05:00
parent ec82c6b8af
commit f502708f7a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.9 (2012-09-30 13:40:33) dev Version 2.0.9 (2012-09-30 13:47:42) dev
gluon/utils.py
+5 -1
View File
@@ -21,7 +21,11 @@ import os
import re import re
import logging import logging
import socket import socket
from contrib.pbkdf2 import pbkdf2_hex try:
from contrib.pbkdf2 import pbkdf2_hex
HAVE_PBKDF2 = True
except ImportError:
HAVE_PBKDF2 = False
logger = logging.getLogger("web2py") logger = logging.getLogger("web2py")