equal
deleted
inserted
replaced
197 return '"%s"' % jsonescape(u) |
197 return '"%s"' % jsonescape(u) |
198 elif isinstance(obj, unicode): |
198 elif isinstance(obj, unicode): |
199 return '"%s"' % jsonescape(obj) |
199 return '"%s"' % jsonescape(obj) |
200 elif util.safehasattr(obj, 'keys'): |
200 elif util.safehasattr(obj, 'keys'): |
201 out = [] |
201 out = [] |
202 for k, v in obj.iteritems(): |
202 for k, v in sorted(obj.iteritems()): |
203 s = '%s: %s' % (json(k), json(v)) |
203 s = '%s: %s' % (json(k), json(v)) |
204 out.append(s) |
204 out.append(s) |
205 return '{' + ', '.join(out) + '}' |
205 return '{' + ', '.join(out) + '}' |
206 elif util.safehasattr(obj, '__iter__'): |
206 elif util.safehasattr(obj, '__iter__'): |
207 out = [] |
207 out = [] |