This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11471

parser: force a `ValueError` to bytes before passing to `error.ParseError`
ClosedPublic

Authored by mharbison72 on Sep 21 2021, 11:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG8655a77dce94: parser: force a `ValueError` to bytes before passing to `error.ParseError`
Summary

I'm not sure what changed before pytype 09-09-2021 (from 04-15-2021), but this
started getting flagged. I think there's a pytype bug here, because I don't
see how .lower() can be getting called on a ValueError after it is forced to
a byte string. That's suppressed for now to make progress.

This fixes:

File "/mnt/c/Users/Matt/hg/mercurial/parser.py", line 219, in unescapestr: Function bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, ints: Iterable[int])
  Actually passed: (self, ints: ValueError)
  Attributes of protocol Iterable[int] are not implemented on ValueError: __iter__
File "/mnt/c/Users/Matt/hg/mercurial/parser.py", line 219, in unescapestr: No attribute 'lower' on ValueError [attribute-error]
  In Union[ValueError, mercurial.pycompat.bytestr]

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/parser.py (7 lines)

Diff 30363

mercurial/parser.py

# an action is a tree node name, a tree label, and an optional match # an action is a tree node name, a tree label, and an optional match
# __call__(program) parses program into a labeled tree # __call__(program) parses program into a labeled tree
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
from .i18n import _ from .i18n import _
from . import ( from . import (
error, error,
pycompat,
util, util,
) )
from .utils import stringutil from .utils import stringutil
class parser(object): class parser(object):
def __init__(self, elements, methods=None): def __init__(self, elements, methods=None):
self._elements = elements self._elements = elements
return args return args
def unescapestr(s): def unescapestr(s):
try: try:
return stringutil.unescapestr(s) return stringutil.unescapestr(s)
except ValueError as e: except ValueError as e:
# mangle Python's exception into our format # mangle Python's exception into our format
raise error.ParseError(pycompat.bytestr(e).lower()) # TODO: remove this suppression. For some reason, pytype 2021.09.09
# thinks .lower() is being called on Union[ValueError, bytes].
# pytype: disable=attribute-error
raise error.ParseError(stringutil.forcebytestr(e).lower())
# pytype: enable=attribute-error
def _prettyformat(tree, leafnodes, level, lines): def _prettyformat(tree, leafnodes, level, lines):
if not isinstance(tree, tuple): if not isinstance(tree, tuple):
lines.append((level, stringutil.pprint(tree))) lines.append((level, stringutil.pprint(tree)))
elif tree[0] in leafnodes: elif tree[0] in leafnodes:
rs = map(stringutil.pprint, tree[1:]) rs = map(stringutil.pprint, tree[1:])
lines.append((level, b'(%s %s)' % (tree[0], b' '.join(rs)))) lines.append((level, b'(%s %s)' % (tree[0], b' '.join(rs))))