[rig3] r449 committed - Change cache keys from MD5 to SHA1

[ri...@googlecode.com]

Revision: 449
Author: ralfoide
Date: Sun Aug 29 22:22:31 2010
Log: Change cache keys from MD5 to SHA1
http://code.google.com/p/rig3/source/detail?r=449

Modified:
/trunk/rig3serv/src/rig/cache.py
/trunk/rig3serv/src/rig/hashable.py
/trunk/rig3serv/src/rig/version.py

=======================================
--- /trunk/rig3serv/src/rig/cache.py Wed Sep 2 21:57:04 2009
+++ /trunk/rig3serv/src/rig/cache.py Sun Aug 29 22:22:31 2010
@@ -23,8 +23,7 @@
__author__ = "ralfoide at gmail com"

import os
-import sys
-import md5
+import sha
import cPickle

from rig import stats
@@ -39,7 +38,7 @@

For each object to store, you need a key, which is an Python structure
(including list, dict, primitives). Computing a key means being able
- to compute a MD5 of the combined __repr__ of these objects. Computing
+ to compute a SHA1 of the combined __repr__ of these objects. Computing
a key can be expensive -- lists and dicts are traversed recursively and
must NOT contain circular references.

@@ -234,18 +233,18 @@
return os.path.join(self._cache_dir, _hash[0:2], _hash)

def _Hash(self, key):
- m = md5.new(str(cPickle.HIGHEST_PROTOCOL))
- self._Md5Hash(m, key)
+ m = sha.new(str(cPickle.HIGHEST_PROTOCOL))
+ self._ShaHash(m, key)
return m.hexdigest()

- def _Md5Hash(self, md, obj):
+ def _ShaHash(self, md, obj):
if isinstance(obj, (list, tuple)):
for v in obj:
- self._Md5Hash(md, v)
+ self._ShaHash(md, v)
elif isinstance(obj, dict):
for k, v in obj.iteritems():
- self._Md5Hash(md, k)
- self._Md5Hash(md, v)
+ self._ShaHash(md, k)
+ self._ShaHash(md, v)
else:
r = repr(obj)
if "object at 0x" in r:
=======================================
--- /trunk/rig3serv/src/rig/hashable.py Mon Oct 26 21:47:21 2009
+++ /trunk/rig3serv/src/rig/hashable.py Sun Aug 29 22:22:31 2010
@@ -53,9 +53,12 @@
self.UpdateHash(md, k)
self.UpdateHash(md, v)

- elif isinstance(obj, (str, unicode)):
+ elif isinstance(obj, str):
md.update(str(obj))

+ elif isinstance(obj, unicode):
+ md.update(unicode(obj))
+
else:
md.update(repr(obj))

=======================================
--- /trunk/rig3serv/src/rig/version.py Sun Aug 29 22:17:07 2010
+++ /trunk/rig3serv/src/rig/version.py Sun Aug 29 22:22:31 2010
@@ -13,7 +13,7 @@
To enable substitutions, do something like this:
$ svn propset svn:keywords "Date Author Revision HeadURL Id" version.py

-----
+-----

Part of Rig3.
Copyright (C) 2007-2009 ralfoide gmail com