x/stackalytics
Code Issues Proposed changes

Merge "Use six constants to make code Python 3 compatible"

Browse Source
This commit is contained in:
Jenkins 2014-01-23 10:27:23 +00:00 committed by Gerrit Code Review
commit 28caaaf91a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stackalytics/openstack/common/jsonutils.py
View File

@ -38,7 +38,6 @@ import functools
import inspect
import itertools
import json
import types
import xmlrpclib
import six
@ -52,7 +51,8 @@ _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
inspect.isabstract]
_simple_types = (types.NoneType, int, basestring, bool, float, long)
_simple_types = (six.string_types + six.integer_types
+ (type(None), bool, float))
def to_primitive(value, convert_instances=False, convert_datetime=True,
@ -117,7 +117,7 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
level=level,
max_depth=max_depth)
if isinstance(value, dict):
return dict((k, recursive(v)) for k, v in value.iteritems())
return dict((k, recursive(v)) for k, v in six.iteritems(value))
elif isinstance(value, (list, tuple)):
return [recursive(lv) for lv in value]

2
stackalytics/processor/vcs.py
View File

@ -177,7 +177,7 @@ class Git(Vcs):
i = 1
commit = {}
for param in GIT_LOG_PARAMS:
commit[param[0]] = unicode(rec.group(i), 'utf8')
commit[param[0]] = six.text_type(rec.group(i), 'utf8')
i += 1
if not utils.check_email_validity(commit['author_email']):