made contrib.pbkdf2 optionional for utils
This commit is contained in:
1 parent
5148c6ec3a
commit
f6652e7530
2 files changed
+6
-2
No files matched your search
@@ -1 +1 @@
|
|||||||
Version 2.0.9 (2012-09-30 13:40:33) dev
|
Version 2.0.9 (2012-09-30 13:47:42) dev
|
||||||
+5
-1
@@ -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")
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user