Mercurial > public > mercurial-scm > hg
comparison mercurial/templatefilters.py @ 14967:376091a4ad23
templatefilters: use safehasattr instead of hasattr
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Mon, 25 Jul 2011 16:02:42 -0500 |
parents | e2c413bde8a5 |
children | f4a8d754cd0a |
comparison
equal
deleted
inserted
replaced
14966:0588fb0e2e8d | 14967:376091a4ad23 |
---|---|
186 elif isinstance(obj, str): | 186 elif isinstance(obj, str): |
187 u = unicode(obj, encoding.encoding, 'replace') | 187 u = unicode(obj, encoding.encoding, 'replace') |
188 return '"%s"' % jsonescape(u) | 188 return '"%s"' % jsonescape(u) |
189 elif isinstance(obj, unicode): | 189 elif isinstance(obj, unicode): |
190 return '"%s"' % jsonescape(obj) | 190 return '"%s"' % jsonescape(obj) |
191 elif hasattr(obj, 'keys'): | 191 elif util.safehasattr(obj, 'keys'): |
192 out = [] | 192 out = [] |
193 for k, v in obj.iteritems(): | 193 for k, v in obj.iteritems(): |
194 s = '%s: %s' % (json(k), json(v)) | 194 s = '%s: %s' % (json(k), json(v)) |
195 out.append(s) | 195 out.append(s) |
196 return '{' + ', '.join(out) + '}' | 196 return '{' + ', '.join(out) + '}' |