summaryrefslogtreecommitdiff
path: root/ceilometer/utils.py
diff options
context:
space:
mode:
authorChristian Berendt <berendt@b1-systems.de>2014-05-26 12:24:15 +0200
committerChristian Berendt <berendt@b1-systems.de>2014-05-27 12:56:13 +0200
commit261559593a2ab217e114cdccac91c5611d089320 (patch)
tree87a53bf9a1214d2a0dfa131cbbb78e44c0ffa1ff /ceilometer/utils.py
parent08eea702572a1f36c06da201b5f6b9ab6ff90f15 (diff)
downloadceilometer-261559593a2ab217e114cdccac91c5611d089320.tar.gz
replaced unicode() with six.text_type()
According to https://wiki.openstack.org/wiki/Python3 unicode() should be replaced with six.text_type(). Change-Id: If314b7ada4976a4cf05f16c2bb2beb54d1f595a1
Diffstat (limited to 'ceilometer/utils.py')
-rw-r--r--ceilometer/utils.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/ceilometer/utils.py b/ceilometer/utils.py
index 23fc7f6a..ec0a7a7f 100644
--- a/ceilometer/utils.py
+++ b/ceilometer/utils.py
@@ -24,6 +24,8 @@ import datetime
import decimal
import multiprocessing
+import six
+
from ceilometer.openstack.common import timeutils
from ceilometer.openstack.common import units
@@ -45,9 +47,9 @@ def recursive_keypairs(d, separator=':'):
# to avoid inconsistencies in the message signature computation
# for equivalent payloads modulo ordering
first = lambda i: i[0]
- m = map(lambda x: unicode(dict(sorted(x.items(), key=first))
- if isinstance(x, dict)
- else x).encode('utf-8'),
+ m = map(lambda x: six.text_type(dict(sorted(x.items(), key=first))
+ if isinstance(x, dict)
+ else x).encode('utf-8'),
value)
yield name, list(m)
else: