openstack/python-keystoneclient
Code Issues Proposed changes

Decode the non-english username str to unicode

Browse Source 
convert the non-english username str to unicode,
then the converted username can match the username from db.

Fixes bug #1221576

Change-Id: I9e5f941fe43f081d75750e3f4754e8beea8210db
This commit is contained in:
YangLei
2013-09-06 17:24:05 +08:00
parent 661d6cf783
commit 54ff072956
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/utils.py
View File

@@ -99,6 +99,8 @@ def find_resource(manager, name_or_id):
# finally try to find entity by name # finally try to find entity by name
try: try:
if isinstance(name_or_id, str):
name_or_id = name_or_id.decode('utf-8', 'strict')
return manager.find(name=name_or_id) return manager.find(name=name_or_id)
except exceptions.NotFound: except exceptions.NotFound:
msg = ("No %s with a name or ID of '%s' exists." % msg = ("No %s with a name or ID of '%s' exists." %

6
tests/test_utils.py
View File

@@ -28,6 +28,7 @@ class FakeManager(object):
resources = { resources = {
'1234': {'name': 'entity_one'}, '1234': {'name': 'entity_one'},
'8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0': {'name': 'entity_two'}, '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0': {'name': 'entity_two'},
'\xe3\x82\xbdtest': {'name': u'\u30bdtest'},
'5678': {'name': '9876'} '5678': {'name': '9876'}
} }
@@ -72,6 +73,11 @@ class FindResourceTestCase(test_utils.TestCase):
output = utils.find_resource(self.manager, uuid) output = utils.find_resource(self.manager, uuid)
self.assertEqual(output, self.manager.resources[uuid]) self.assertEqual(output, self.manager.resources[uuid])
def test_find_by_unicode(self):
name = '\xe3\x82\xbdtest'
output = utils.find_resource(self.manager, name)
self.assertEqual(output, self.manager.resources[name])
def test_find_by_str_name(self): def test_find_by_str_name(self):
output = utils.find_resource(self.manager, 'entity_one') output = utils.find_resource(self.manager, 'entity_one')
self.assertEqual(output, self.manager.resources['1234']) self.assertEqual(output, self.manager.resources['1234'])