starlingx
/
config
Code Issues Proposed changes

Merge "Fix types issue for Python 2/3 compatible code."

This commit is contained in:
Zuul 2018-11-05 19:33:32 +00:00 committed by Gerrit Code Review
parent 84680c260c 0106d11bba
commit 829fb06122
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysinv/sysinv/sysinv/sysinv/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,7 @@ _nasty_type_tests = [inspect.ismodule, inspect.isclass, inspect.ismethod,
inspect.iscode, inspect.isbuiltin, inspect.isroutine,
inspect.isabstract]
_simple_types = (types.NoneType, six.integer_types, basestring, bool, float)
_simple_types = (type(None), six.integer_types, basestring, bool, float)
def to_primitive(value, convert_instances=False, convert_datetime=True,

2
sysinv/sysinv/sysinv/sysinv/openstack/common/rpc/impl_zmq.py
View File

@ -743,7 +743,7 @@ def _call(addr, context, topic, msg, timeout=None,
# One effect of this is that we're checking all
# responses for Exceptions.
for resp in responses:
if isinstance(resp, types.DictType) and 'exc' in resp:
if isinstance(resp, dict) and 'exc' in resp:
raise rpc_common.deserialize_remote_exception(CONF, resp['exc'])
return responses[-1]