catched attributeerror

2013-07-30 09:12:22 -05:00
parent 487cfc1cf7
commit 26c8fcd5b3
2 changed files with 2 additions and 2 deletions
--- a/2
+++ b/2
@@ -1 +1 @@
-Version 2.6.0-development+timestamp.2013.07.29.07.50.41
+Version 2.6.0-development+timestamp.2013.07.30.09.11.35
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -46,7 +46,7 @@ import hmac
 try:
    try:
        from contrib.pbkdf2_ctypes import pbkdf2_hex
-    except ImportError:
+    except (ImportError, AttributeError):
        from contrib.pbkdf2 import pbkdf2_hex
    HAVE_PBKDF2 = True
 except ImportError: