diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-22 19:44:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-22 19:44:02 +0000 |
| commit | 6304da92928658d1774d25f4a6f479e0f8489123 (patch) | |
| tree | a84afabd6642b4fc5554b696a715345c9ff60be0 | |
| parent | 27d9604ac091b1a97216a2bb21c939151bcd0087 (diff) | |
| parent | 67ce03e7396d63cdf6b16584b11ac29851a8231e (diff) | |
| download | django_openstack_auth-6304da92928658d1774d25f4a6f479e0f8489123.tar.gz | |
Merge "Fix token hashing with python 3"
| -rw-r--r-- | openstack_auth/tests/tests.py | 3 | ||||
| -rw-r--r-- | openstack_auth/user.py | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/openstack_auth/tests/tests.py b/openstack_auth/tests/tests.py index 10f6709..79f347e 100644 --- a/openstack_auth/tests/tests.py +++ b/openstack_auth/tests/tests.py @@ -29,9 +29,7 @@ from keystoneclient.v2_0 import client as client_v2 from keystoneclient.v3 import client as client_v3 import mock from mox3 import mox -import sys from testscenarios import load_tests_apply_scenarios # noqa -import unittest from openstack_auth import policy from openstack_auth.tests import data_v2 @@ -1165,7 +1163,6 @@ class UserTestCase(test.TestCase): def setUp(self): self.data = data_v3.generate_test_data(pki=True) - @unittest.skipIf(sys.version_info >= (3, 0), "Bug #1552443") def test_unscoped_token_is_none(self): created_token = user.Token(self.data.domain_scoped_access_info, unscoped_token=None) diff --git a/openstack_auth/user.py b/openstack_auth/user.py index 854d268..c55121b 100644 --- a/openstack_auth/user.py +++ b/openstack_auth/user.py @@ -88,12 +88,12 @@ class Token(object): algorithm = getattr(settings, 'OPENSTACK_TOKEN_HASH_ALGORITHM', 'md5') hasher = hashlib.new(algorithm) - hasher.update(self.id) + hasher.update(self.id.encode('utf-8')) self.id = hasher.hexdigest() # Only hash unscoped token if needed if self._is_pki_token(self.unscoped_token): hasher = hashlib.new(algorithm) - hasher.update(self.unscoped_token) + hasher.update(self.unscoped_token.encode('utf-8')) self.unscoped_token = hasher.hexdigest() self.expires = auth_ref.expires |