equal
deleted
inserted
replaced
22 from . import ( |
22 from . import ( |
23 encoding, |
23 encoding, |
24 error, |
24 error, |
25 pycompat, |
25 pycompat, |
26 util, |
26 util, |
|
27 ) |
|
28 from .utils import ( |
|
29 stringutil, |
27 ) |
30 ) |
28 |
31 |
29 class parser(object): |
32 class parser(object): |
30 def __init__(self, elements, methods=None): |
33 def __init__(self, elements, methods=None): |
31 self._elements = elements |
34 self._elements = elements |
188 d[k] = x[2] |
191 d[k] = x[2] |
189 return args |
192 return args |
190 |
193 |
191 def unescapestr(s): |
194 def unescapestr(s): |
192 try: |
195 try: |
193 return util.unescapestr(s) |
196 return stringutil.unescapestr(s) |
194 except ValueError as e: |
197 except ValueError as e: |
195 # mangle Python's exception into our format |
198 # mangle Python's exception into our format |
196 raise error.ParseError(pycompat.bytestr(e).lower()) |
199 raise error.ParseError(pycompat.bytestr(e).lower()) |
197 |
200 |
198 def _brepr(obj): |
201 def _brepr(obj): |
199 if isinstance(obj, bytes): |
202 if isinstance(obj, bytes): |
200 return b"'%s'" % util.escapestr(obj) |
203 return b"'%s'" % stringutil.escapestr(obj) |
201 return encoding.strtolocal(repr(obj)) |
204 return encoding.strtolocal(repr(obj)) |
202 |
205 |
203 def _prettyformat(tree, leafnodes, level, lines): |
206 def _prettyformat(tree, leafnodes, level, lines): |
204 if not isinstance(tree, tuple): |
207 if not isinstance(tree, tuple): |
205 lines.append((level, _brepr(tree))) |
208 lines.append((level, _brepr(tree))) |