replace basetring/xrange

basetring --> six.string_types
xrange --> six.moves.xrange

Partial Implement: blueprint py33-support

Change-Id: Iedc2cd66ec65c0e4685e56a3bfbf8e9d38fd0072

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:

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'],