Changeset 3194

Timestamp:

10/26/09 09:36:13 (4 years ago)

Author:

fredj

Message:

sha and md5 are deprecated since version 2.5

Location:

sandbox/camptocamp/Studio/studio

Files:

• lib/datasource_discovery.py (modified) (2 diffs)
• model/__init__.py (modified) (2 diffs)

sandbox/camptocamp/Studio/studio/lib/datasource_discovery.py

@@ -9 +9 @@
     import gdal
 
-import md5
+
+try:
+    from hashlib import md5
+except ImportError:
+    from md5 import new as md5
+
 import mapscript
 import mapserializer
@@ -294 +299 @@
 
     def getHash(self):
-        return md5.new(self.name).hexdigest()
+        return md5(self.name).hexdigest()
 
 class GdalDataSource(DataSource):

sandbox/camptocamp/Studio/studio/model/__init__.py

@@ -6 +6 @@
 from studio.lib.sa_types import JsonString
 
-import sha
+try:
+    from hashlib import sha1
+except ImportError:
+    from sha import new as sha1
 
 def init_model(engine):
@@ -96 +99 @@
     def __encrypt_password(self, password):
         """Hash the given password with SHA1."""
-        return sha.new(password).hexdigest()
+        return sha1(password).hexdigest()
 
     def validate_password(self, passwd):