From f502708f7aa0a58b94f073e0b145d833b2dc68a6 Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Sun, 30 Sep 2012 13:47:49 -0500
Subject: [PATCH] made contrib.pbkdf2 optionional for utils

---
 VERSION        | 2 +-
 gluon/utils.py | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/VERSION b/VERSION
index 680ac6b1..f6d61413 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.9 (2012-09-30 13:40:33) dev
+Version 2.0.9 (2012-09-30 13:47:42) dev
diff --git a/gluon/utils.py b/gluon/utils.py
index 94376894..1d1e232c 100644
--- a/gluon/utils.py
+++ b/gluon/utils.py
@@ -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")