From 45e0cbe52d0a29ad54105cfebd1b8d347cef7cfa Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Fri, 12 Jul 2013 14:27:37 -0400
Subject: python3: Add basic python3 compatibility.

Use six.text_type to replace unicode() in python2
and str in python3.

Change-Id: I61e961248241014380ec464429f2585a9497333b
Signed-off-by: Chuck Short <chuck.short@canonical.com>
---
 openstack/common/gettextutils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'openstack/common')

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
-- 
cgit