# HG changeset patch # User Yuya Nishihara # Date 1451209803 -32400 # Node ID 93b5c540db69b9130b5549a7eca336d6158d0ee9 # Parent d4419c01532bd309503bbffd6f0030a864cbbd6b templatefilters: drop old jsonescape() function It's been superseded by encoding.jsonescape(paranoid=True). diff -r d4419c01532b -r 93b5c540db69 mercurial/templatefilters.py --- a/mercurial/templatefilters.py Sun Dec 27 17:59:57 2015 +0900 +++ b/mercurial/templatefilters.py Sun Dec 27 18:50:03 2015 +0900 @@ -215,23 +215,6 @@ else: raise TypeError('cannot encode type %s' % obj.__class__.__name__) -def _uescape(c): - if 0x20 <= ord(c) < 0x80: - return c - else: - return '\\u%04x' % ord(c) - -_escapes = [ - ('\\', '\\\\'), ('"', '\\"'), ('\t', '\\t'), ('\n', '\\n'), - ('\r', '\\r'), ('\f', '\\f'), ('\b', '\\b'), - ('<', '\\u003c'), ('>', '\\u003e'), ('\0', '\\u0000') -] - -def jsonescape(s): - for k, v in _escapes: - s = s.replace(k, v) - return ''.join(_uescape(c) for c in s) - def lower(text): """:lower: Any text. Converts the text to lowercase.""" return encoding.lower(text) diff -r d4419c01532b -r 93b5c540db69 tests/test-template-engine.t --- a/tests/test-template-engine.t Sun Dec 27 17:59:57 2015 +0900 +++ b/tests/test-template-engine.t Sun Dec 27 18:50:03 2015 +0900 @@ -44,17 +44,4 @@ 0 97e5f848f0936960273bbf75be6388cd0350a32b -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000 -1 0000000000000000000000000000000000000000 -Fuzzing the unicode escaper to ensure it produces valid data - -#if hypothesis - - >>> from hypothesishelpers import * - >>> import mercurial.templatefilters as tf - >>> import json - >>> @check(st.text().map(lambda s: s.encode('utf-8'))) - ... def testtfescapeproducesvalidjson(text): - ... json.loads('"' + tf.jsonescape(text) + '"') - -#endif - $ cd ..