summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-18 12:36:45 +0000
committerGerrit Code Review <review@openstack.org>2013-07-18 12:36:45 +0000
commit7227f1ec7ef16a3b1ba0c5cb4e9e77dac82a9d35 (patch)
tree4bd2efcb164ecf3a1a07e21261ba4ab2e2b0289c
parent79b8840f5e6ac95f850cbc1236bfebffb5e1349f (diff)
parent45e0cbe52d0a29ad54105cfebd1b8d347cef7cfa (diff)
downloadoslo-7227f1ec7ef16a3b1ba0c5cb4e9e77dac82a9d35.tar.gz
oslo-7227f1ec7ef16a3b1ba0c5cb4e9e77dac82a9d35.tar.xz
oslo-7227f1ec7ef16a3b1ba0c5cb4e9e77dac82a9d35.zip
Merge "python3: Add basic python3 compatibility."
-rw-r--r--openstack/common/gettextutils.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/openstack/common/gettextutils.py b/openstack/common/gettextutils.py
index 0e27425..cacdb5b 100644
--- a/openstack/common/gettextutils.py
+++ b/openstack/common/gettextutils.py
@@ -30,6 +30,8 @@ import logging.handlers
import os
import UserString
+import six
+
_localedir = os.environ.get('oslo'.upper() + '_LOCALEDIR')
_t = gettext.translation('oslo', localedir=_localedir, fallback=True)
@@ -120,7 +122,7 @@ class Message(UserString.UserString, object):
if self.params is not None:
full_msg = full_msg % self.params
- return unicode(full_msg)
+ return six.text_type(full_msg)
def _save_parameters(self, other):
# we check for None later to see if