diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2010-02-12 10:55:09 -0500 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2010-02-12 17:08:27 -0500 |
| commit | 2779da3096450ea08ced146e7455ae4a764dac71 (patch) | |
| tree | 5986fad49977f7a97bc008400d754bfd386f8a4c /ipalib | |
| parent | 069763c5c616221fd0bcea813cad93ae3f7c072d (diff) | |
| download | freeipa-2779da3096450ea08ced146e7455ae4a764dac71.tar.gz freeipa-2779da3096450ea08ced146e7455ae4a764dac71.tar.xz freeipa-2779da3096450ea08ced146e7455ae4a764dac71.zip | |
Fix deprecation error importing sha
Diffstat (limited to 'ipalib')
| -rw-r--r-- | ipalib/ipauuid.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ipalib/ipauuid.py b/ipalib/ipauuid.py index 25bd70aa..59753d04 100644 --- a/ipalib/ipauuid.py +++ b/ipalib/ipauuid.py @@ -555,8 +555,11 @@ def uuid4(): def uuid5(namespace, name): """Generate a UUID from the SHA-1 hash of a namespace UUID and a name.""" - import sha - hash = sha.sha(namespace.bytes + name).digest() + try: + from hashlib import sha1 as sha + except ImportError: + from sha import sha + hash = sha(namespace.bytes + name).digest() return UUID(bytes=hash[:16], version=5) # The following standard UUIDs are for use with uuid3() or uuid5(). |