Mercurial > public > mercurial-scm > hg
comparison mercurial/templatefilters.py @ 19886:e828975722c8
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 09 Oct 2013 14:15:34 -0700 |
parents | 681f7b9213a4 55c763926a28 |
children | cce404b0c918 829f2dd99f5c |
comparison
equal
deleted
inserted
replaced
19885:6cc696179869 | 19886:e828975722c8 |
---|---|
213 return '\\u%04x' % ord(c) | 213 return '\\u%04x' % ord(c) |
214 | 214 |
215 _escapes = [ | 215 _escapes = [ |
216 ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'), | 216 ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'), |
217 ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'), | 217 ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'), |
218 ('<', '\\u003c'), ('>', '\\u003e') | |
218 ] | 219 ] |
219 | 220 |
220 def jsonescape(s): | 221 def jsonescape(s): |
221 for k, v in _escapes: | 222 for k, v in _escapes: |
222 s = s.replace(k, v) | 223 s = s.replace(k, v) |