Changeset 1177 for trunk/src/cryptobox/core/settings.py

Timestamp:

06/16/09 04:16:29 (14 months ago)

Author:

lars

Message:

* use "hashlib" instead of "sha" (deprecated since python2.6) if available

Files:

• trunk/src/cryptobox/core/settings.py (modified) (2 diffs)

trunk/src/cryptobox/core/settings.py

@@ -444 +444 @@
         """Load the user database file if it exists.
         """
-        import StringIO, sha
+        import StringIO
+        try:
+            # hashlib is available since python2.5
+            import hashlib
+            get_hash_obj = lambda text: hashlib.sha1(text)
+        except ImportError:
+            # sha is deprecated since python2.6
+            import sha
+            get_hash_obj = lambda text: sha.new(text)
         user_db_rules = StringIO.StringIO(self.userDatabaseSpec)
         try:
@@ -469 +477 @@
         user_db.validate(validate.Validator())
         ## define password hash function - never use "sha" directly - SPOT
-        user_db.get_digest = lambda password: sha.new(password).hexdigest()
+        user_db.get_digest = lambda password: get_hash_obj(password).hexdigest()
         return user_db