This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11467

encoding: force a few Errors to bytes before passing to `error.Abort`
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG28c62f83b652: encoding: force a few Errors to bytes before passing to `error.Abort`
Summary

I'm not sure what changed before pytype 09-09-2021 (from 04-15-2021), but these
started getting flagged. PyCharm also flagged these. This fixes the following:

File "/mnt/c/Users/Matt/hg/mercurial/encoding.py", line 243, in fromlocal: Function Abort.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, message: Union[bytearray, bytes, memoryview], ...)
  Actually passed: (self, message: LookupError, ...)
File "/mnt/c/Users/Matt/hg/mercurial/encoding.py", line 309, in lower: Function Abort.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, message: Union[bytearray, bytes, memoryview], ...)
  Actually passed: (self, message: LookupError, ...)
File "/mnt/c/Users/Matt/hg/mercurial/encoding.py", line 336, in upperfallback: Function Abort.__init__ was called with the wrong arguments [wrong-arg-types]
         Expected: (self, message: Union[bytearray, bytes, memoryview], ...)
  Actually passed: (self, message: LookupError, ...)
Called from (traceback):
  line 391, in current file
  line 348, in get
  line 318, in upper

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/encoding.py (12 lines)

Diff 30359

mercurial/encoding.py

u = s.decode(_sysstr(encoding), _sysstr(encodingmode)) u = s.decode(_sysstr(encoding), _sysstr(encodingmode))
return u.encode("utf-8") return u.encode("utf-8")
except UnicodeDecodeError as inst: except UnicodeDecodeError as inst:
sub = s[max(0, inst.start - 10) : inst.start + 10] sub = s[max(0, inst.start - 10) : inst.start + 10]
raise error.Abort( raise error.Abort(
b"decoding near '%s': %s!" % (sub, pycompat.bytestr(inst)) b"decoding near '%s': %s!" % (sub, pycompat.bytestr(inst))
) )
except LookupError as k: except LookupError as k:
raise error.Abort(k, hint=b"please check your locale settings") raise error.Abort(
pycompat.bytestr(k), hint=b"please check your locale settings"
)
def unitolocal(u): def unitolocal(u):
# type: (Text) -> bytes # type: (Text) -> bytes
"""Convert a unicode string to a byte string of local encoding""" """Convert a unicode string to a byte string of local encoding"""
return tolocal(u.encode('utf-8')) return tolocal(u.encode('utf-8'))
lu = u.lower() lu = u.lower()
if u == lu: if u == lu:
return s # preserve localstring return s # preserve localstring
return lu.encode(_sysstr(encoding)) return lu.encode(_sysstr(encoding))
except UnicodeError: except UnicodeError:
return s.lower() # we don't know how to fold this except in ASCII return s.lower() # we don't know how to fold this except in ASCII
except LookupError as k: except LookupError as k:
raise error.Abort(k, hint=b"please check your locale settings") raise error.Abort(
pycompat.bytestr(k), hint=b"please check your locale settings"
)
def upper(s): def upper(s):
# type: (bytes) -> bytes # type: (bytes) -> bytes
"""best-effort encoding-aware case-folding of local string s""" """best-effort encoding-aware case-folding of local string s"""
try: try:
return asciiupper(s) return asciiupper(s)
except UnicodeDecodeError: except UnicodeDecodeError:
uu = u.upper() uu = u.upper()
if u == uu: if u == uu:
return s # preserve localstring return s # preserve localstring
return uu.encode(_sysstr(encoding)) return uu.encode(_sysstr(encoding))
except UnicodeError: except UnicodeError:
return s.upper() # we don't know how to fold this except in ASCII return s.upper() # we don't know how to fold this except in ASCII
except LookupError as k: except LookupError as k:
raise error.Abort(k, hint=b"please check your locale settings") raise error.Abort(
pycompat.bytestr(k), hint=b"please check your locale settings"
)
if not _nativeenviron: if not _nativeenviron:
# now encoding and helper functions are available, recreate the environ # now encoding and helper functions are available, recreate the environ
# dict to be exported to other modules # dict to be exported to other modules
if pycompat.iswindows and pycompat.ispy3: if pycompat.iswindows and pycompat.ispy3:
class WindowsEnviron(dict): class WindowsEnviron(dict):