openstack/python-keystoneclient
Code Issues Proposed changes

Merge "Make _get_utf8_value Python3 compliant"

Browse Source
This commit is contained in:
Jenkins
2013-12-30 02:22:58 +00:00
committed by Gerrit Code Review
parent 85cfce17f5 f02239cee9
commit ce6c54de91
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystoneclient/contrib/ec2/utils.py
View File

@@ -101,9 +101,9 @@ class Ec2Signer(object):
@staticmethod @staticmethod
def _get_utf8_value(value): def _get_utf8_value(value):
"""Get the UTF8-encoded version of a value.""" """Get the UTF8-encoded version of a value."""
if not isinstance(value, str) and not isinstance(value, unicode): if not isinstance(value, (six.binary_type, six.text_type)):
value = str(value) value = str(value)
if isinstance(value, unicode): if isinstance(value, six.text_type):
return value.encode('utf-8') return value.encode('utf-8')
else: else:
return value return value