made contrib.pbkdf2 optionional for utils

2012-09-30 13:47:49 -05:00
parent ec82c6b8af
commit f502708f7a
2 changed files with 6 additions and 2 deletions
@@ -1 +1 @@
-Version 2.0.9 (2012-09-30 13:40:33) dev
+Version 2.0.9 (2012-09-30 13:47:42) dev
@@ -21,7 +21,11 @@ import os
 import re
 import logging
 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")