use hashlib and fallback to sha (for python 2.4)

diff --git a/conf_files.py b/conf_files.py
index e7b823d..4801979 100644 (file)
--- a/conf_files.py
+++ b/conf_files.py
@@ -6,7 +6,10 @@
 import grp
 import os
 import pwd
 import grp
 import os
 import pwd

-import sha
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    from sha import sha

 import string
 
 import curlwrapper
 import string
 
 import curlwrapper


@@ -27,7 +30,7 @@ class conf_files:
     def checksum(self, path):
         try:
             f = open(path)
     def checksum(self, path):
         try:
             f = open(path)

-            try: return sha.new(f.read()).digest()
+            try: return sha(f.read()).digest()

             finally: f.close()
         except IOError: return None
 
             finally: f.close()
         except IOError: return None
 


@@ -66,7 +69,7 @@ class conf_files:
         except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
             return
         except xmlrpclib.ProtocolError,e:
             logger.log('conf_files: failed to retrieve %s from %s, skipping' % (dest, url))
             return

-        if not cf_rec['always_update'] and sha.new(contents).digest() == self.checksum(dest):
+        if not cf_rec['always_update'] and sha(contents).digest() == self.checksum(dest):

             return
         if self.system(cf_rec['preinstall_cmd']):
             self.system(err_cmd)
             return
         if self.system(cf_rec['preinstall_cmd']):
             self.system(err_cmd)

diff --git a/plcapi.py b/plcapi.py
index a2d31cb..6ed3cac 100644 (file)
--- a/plcapi.py
+++ b/plcapi.py
@@ -2,7 +2,11 @@
 # $URL$
 
 import safexmlrpc
 # $URL$
 
 import safexmlrpc

-import hmac, sha
+import hmac
+try:
+    from hashlib import sha1 as sha
+except ImportError:
+    import sha

 import logger
 
 class PLCAPI:
 import logger
 
 class PLCAPI: