← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/openstack/common/jsonutils.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2013-09-08 21:51:19 UTC
  • mto: This revision was merged to the branch mainline in revision 14.
  • Revision ID: package-import@ubuntu.com-20130908215119-7tcek6gn73275x5k
Tags: upstream-2013.2~b3
Import upstream version 2013.2~b3

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/openstack/common/jsonutils.py
41
41
import types
42
42
import xmlrpclib
43
43
 
 
44
import netaddr
44
45
import six
45
46
 
46
47
from heat.openstack.common import timeutils
137
138
            # Likely an instance of something. Watch for cycles.
138
139
            # Ignore class member vars.
139
140
            return recursive(value.__dict__, level=level + 1)
 
141
        elif isinstance(value, netaddr.IPAddress):
 
142
            return six.text_type(value)
140
143
        else:
141
144
            if any(test(value) for test in _nasty_type_tests):
142
145
                return six.text_type(value)