diff options
author | Merov Linden <merov@lindenlab.com> | 2010-09-16 14:27:42 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-09-16 14:27:42 -0700 |
commit | a36033853a7d567e92713a0392b29754521f338b (patch) | |
tree | bb1cbd5c69c5dc87e05175a17a6a1a7654496ddc /indra/lib/python/uuid.py | |
parent | 71507653a0ecf209b3faec4bed3c4a443fdc8833 (diff) |
STORM-168 : Python modules cleanup
Diffstat (limited to 'indra/lib/python/uuid.py')
-rw-r--r-- | indra/lib/python/uuid.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/lib/python/uuid.py b/indra/lib/python/uuid.py index 48dac84377..0bc21a35f8 100644 --- a/indra/lib/python/uuid.py +++ b/indra/lib/python/uuid.py @@ -446,8 +446,14 @@ def uuid1(node=None, clock_seq=None): def uuid3(namespace, name): """Generate a UUID from the MD5 hash of a namespace UUID and a name.""" - import md5 - hash = md5.md5(namespace.bytes + name).digest() + try: + # Python 2.6 + from hashlib import md5 + except ImportError: + # Python 2.5 and earlier + from md5 import new as md5 + + hash = md5(namespace.bytes + name).digest() return UUID(bytes=hash[:16], version=3) def uuid4(): |