From 253569d0700839e277809f3f0ee8c662dedfdbea Mon Sep 17 00:00:00 2001 From: Kui Shi Date: Mon, 14 Oct 2013 17:56:11 +0800 Subject: [PATCH] replace basetring/xrange basetring --> six.string_types xrange --> six.moves.xrange Partial Implement: blueprint py33-support Change-Id: Iedc2cd66ec65c0e4685e56a3bfbf8e9d38fd0072 --- ceilometerclient/common/utils.py | 2 +- ceilometerclient/tests/v2/test_alarms.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ceilometerclient/common/utils.py b/ceilometerclient/common/utils.py index c22dde42..3f2fa910 100644 --- a/ceilometerclient/common/utils.py +++ b/ceilometerclient/common/utils.py @@ -74,7 +74,7 @@ def print_dict(d, dict_property="Property", wrap=0): v = str(v) # if value has a newline, add in multiple rows # e.g. fault with stacktrace - if v and isinstance(v, basestring) and r'\n' in v: + if v and isinstance(v, six.string_types) and r'\n' in v: lines = v.strip().split(r'\n') col1 = k for line in lines: diff --git a/ceilometerclient/tests/v2/test_alarms.py b/ceilometerclient/tests/v2/test_alarms.py index 778d58ac..eae85211 100644 --- a/ceilometerclient/tests/v2/test_alarms.py +++ b/ceilometerclient/tests/v2/test_alarms.py @@ -22,6 +22,7 @@ import testtools from ceilometerclient.tests import utils from ceilometerclient.v2 import alarms +from six.moves import xrange AN_ALARM = {u'alarm_actions': [u'http://site:8000/alarm'], u'ok_actions': [u'http://site:8000/ok'],