diff options
author | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
---|---|---|
committer | Dessie Linden <dessie@lindenlab.com> | 2010-11-15 12:05:05 -0800 |
commit | 5bfa6095db3a0a9c7367b7dde3f2e24e023cb7f4 (patch) | |
tree | 1ab6b0946d7bfb881a2ccfaa2382d24b46a6b729 /indra/lib/python/uuid.py | |
parent | 65d847de38614a67ed1bdd86445c1c80f4638cc3 (diff) | |
parent | c13f6afe73bea4311a91d65dde2f6e1c5bc453b3 (diff) |
Added viewer-release.release-viewer.jira parameter to write build comment to DRTVWR-13
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(): |