/rev/4b686925f035 changeset: 1278:4b686925f035 user: Martin Geisler <[email protected]> date: Fri Oct 16 14:29:22 2009 +0200 summary: Fix sha1 import for Python 2.4.
diffstat: viff/hash_broadcast.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diffs (15 lines): diff -r 26f7a133172a -r 4b686925f035 viff/hash_broadcast.py --- a/viff/hash_broadcast.py Fri Oct 09 16:33:15 2009 +0200 +++ b/viff/hash_broadcast.py Fri Oct 16 14:29:22 2009 +0200 @@ -19,7 +19,10 @@ from twisted.internet.defer import gatherResults, Deferred, DeferredList -from hashlib import sha1 +try: + from hashlib import sha1 +except ImportError: + from sha import sha as sha1 from viff.constants import TEXT, INCONSISTENTHASH, OK, HASH, SIGNAL error_msg = "Player %i, has received an inconsistent hash %s." _______________________________________________ viff-commits mailing list [email protected] http://lists.viff.dk/listinfo.cgi/viff-commits-viff.dk
