This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11918

pytype: stop excluding stringutil.py
ClosedPublic

Authored by mharbison72 on Dec 14 2021, 4:10 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGdcdecec401ca: pytype: stop excluding stringutil.py
Summary

This fixes the following:

File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 267, in prettyrepr:
    Function bytes.startswith expects 2 arg(s), got 3 [wrong-arg-count]
         Expected: (self, prefix)
  Actually passed: (self, prefix, _)
File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 695, in escapestr:
    No attribute 'escape_encode' on module 'codecs' [module-attr]
File "/mnt/c/Users/Matt/hg/mercurial/utils/stringutil.py", line 699, in unescapestr:
    No attribute 'escape_decode' on module 'codecs' [module-attr]

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.

Event Timeline

mharbison72 created this revision.Dec 14 2021, 4:10 PM
Alphare accepted this revision.Dec 15 2021, 5:23 AM
This revision is now accepted and ready to land.Dec 15 2021, 5:23 AM
mharbison72 added a commit: rHGdcdecec401ca: pytype: stop excluding stringutil.py.Dec 17 2021, 6:10 AM
Closed by commit rHGdcdecec401ca: pytype: stop excluding stringutil.py (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 31512

mercurial/utils/stringutil.py

while p0 < len(rs): while p0 < len(rs):
# '... field=<type ... field=<type ...' # '... field=<type ... field=<type ...'
# ~~~~~~~~~~~~~~~~ # ~~~~~~~~~~~~~~~~
# p0 p1 q0 q1 # p0 p1 q0 q1
q0 = -1 q0 = -1
q1 = rs.find(b'<', p1 + 1) q1 = rs.find(b'<', p1 + 1)
if q1 < 0: if q1 < 0:
q1 = len(rs) q1 = len(rs)
# pytype: disable=wrong-arg-count
# TODO: figure out why pytype doesn't recognize the optional start
# arg
elif q1 > p1 + 1 and rs.startswith(b'=', q1 - 1): elif q1 > p1 + 1 and rs.startswith(b'=', q1 - 1):
# pytype: enable=wrong-arg-count
# backtrack for ' field=<' # backtrack for ' field=<'
q0 = rs.rfind(b' ', p1 + 1, q1 - 1) q0 = rs.rfind(b' ', p1 + 1, q1 - 1)
if q0 < 0: if q0 < 0:
q0 = q1 q0 = q1
else: else:
q0 += 1 # skip ' ' q0 += 1 # skip ' '
l = rs.count(b'<', 0, p0) - rs.count(b'>', 0, p0) l = rs.count(b'<', 0, p0) - rs.count(b'>', 0, p0)
assert l >= 0 assert l >= 0
return encoding.trim(text, maxlength, ellipsis=b'...') return encoding.trim(text, maxlength, ellipsis=b'...')
def escapestr(s): def escapestr(s):
if isinstance(s, memoryview): if isinstance(s, memoryview):
s = bytes(s) s = bytes(s)
# call underlying function of s.encode('string_escape') directly for # call underlying function of s.encode('string_escape') directly for
# Python 3 compatibility # Python 3 compatibility
return codecs.escape_encode(s)[0] return codecs.escape_encode(s)[0] # pytype: disable=module-attr
def unescapestr(s): def unescapestr(s):
return codecs.escape_decode(s)[0] return codecs.escape_decode(s)[0] # pytype: disable=module-attr
def forcebytestr(obj): def forcebytestr(obj):
"""Portably format an arbitrary object (e.g. exception) into a byte """Portably format an arbitrary object (e.g. exception) into a byte
string.""" string."""
try: try:
return pycompat.bytestr(obj) return pycompat.bytestr(obj)
except UnicodeEncodeError: except UnicodeEncodeError:

tests/test-check-pytype.t

mercurial/repoview.py # [attribute-error] mercurial/repoview.py # [attribute-error]
mercurial/sslutil.py # [attribute-error] mercurial/sslutil.py # [attribute-error]
mercurial/statprof.py # bytes vs str on TextIO.write() [wrong-arg-types] mercurial/statprof.py # bytes vs str on TextIO.write() [wrong-arg-types]
mercurial/testing/storage.py # tons of [attribute-error] mercurial/testing/storage.py # tons of [attribute-error]
mercurial/ui.py # [attribute-error], [wrong-arg-types] mercurial/ui.py # [attribute-error], [wrong-arg-types]
mercurial/unionrepo.py # ui, svfs, unfiltered [attribute-error] mercurial/unionrepo.py # ui, svfs, unfiltered [attribute-error]
mercurial/util.py # [attribute-error], [wrong-arg-count] mercurial/util.py # [attribute-error], [wrong-arg-count]
mercurial/utils/procutil.py # [attribute-error], [module-attr], [bad-return-type] mercurial/utils/procutil.py # [attribute-error], [module-attr], [bad-return-type]
mercurial/utils/stringutil.py # [module-attr], [wrong-arg-count]
mercurial/utils/memorytop.py # not 3.6 compatible mercurial/utils/memorytop.py # not 3.6 compatible
mercurial/win32.py # [not-callable] mercurial/win32.py # [not-callable]
mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error] mercurial/wireprotoframing.py # [unsupported-operands], [attribute-error], [import-error]
mercurial/wireprotoserver.py # line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any], Any] [attribute-error] mercurial/wireprotoserver.py # line 253, in _availableapis: No attribute '__iter__' on Callable[[Any, Any], Any] [attribute-error]
mercurial/wireprotov1peer.py # [attribute-error] mercurial/wireprotov1peer.py # [attribute-error]
mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs mercurial/wireprotov1server.py # BUG?: BundleValueError handler accesses subclass's attrs
mercurial/wireprotov2server.py # [unsupported-operands], [attribute-error] mercurial/wireprotov2server.py # [unsupported-operands], [attribute-error]
> -x mercurial/repoview.py \ > -x mercurial/repoview.py \
> -x mercurial/sslutil.py \ > -x mercurial/sslutil.py \
> -x mercurial/statprof.py \ > -x mercurial/statprof.py \
> -x mercurial/testing/storage.py \ > -x mercurial/testing/storage.py \
> -x mercurial/thirdparty \ > -x mercurial/thirdparty \
> -x mercurial/ui.py \ > -x mercurial/ui.py \
> -x mercurial/unionrepo.py \ > -x mercurial/unionrepo.py \
> -x mercurial/utils/procutil.py \ > -x mercurial/utils/procutil.py \
> -x mercurial/utils/stringutil.py \
> -x mercurial/utils/memorytop.py \ > -x mercurial/utils/memorytop.py \
> -x mercurial/win32.py \ > -x mercurial/win32.py \
> -x mercurial/wireprotoframing.py \ > -x mercurial/wireprotoframing.py \
> -x mercurial/wireprotoserver.py \ > -x mercurial/wireprotoserver.py \
> -x mercurial/wireprotov1peer.py \ > -x mercurial/wireprotov1peer.py \
> -x mercurial/wireprotov1server.py \ > -x mercurial/wireprotov1server.py \
> -x mercurial/wireprotov2server.py \ > -x mercurial/wireprotov2server.py \
> > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt > > $TESTTMP/pytype-output.txt || cat $TESTTMP/pytype-output.txt
Only show the results on a failure, because the output on success is also Only show the results on a failure, because the output on success is also
voluminous and variable. voluminous and variable.