Mercurial > hg
changeset 46691:1099541b6462 stable
hg: convert an exception to bytes in the repo creation exception handler
Caught by pytype:
File "/mnt/c/Users/Matt/hg/mercurial/hg.py", line 77, in _local: Function _bytestr.__init__ was called with the wrong arguments [wrong-arg-types]
Expected: (self, ints: Iterable[int])
Actually passed: (self, ints: Union[TypeError, ValueError])
Differential Revision: https://phab.mercurial-scm.org/D10176
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 11 Mar 2021 18:09:55 -0500 |
| parents | 90a92f041fc6 |
| children | 39f23d20ea47 |
| files | mercurial/hg.py |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/hg.py Thu Mar 11 17:55:52 2021 -0500 +++ b/mercurial/hg.py Thu Mar 11 18:09:55 2021 -0500 @@ -41,7 +41,6 @@ mergestate as mergestatemod, narrowspec, phases, - pycompat, requirements, scmutil, sshpeer, @@ -53,7 +52,11 @@ verify as verifymod, vfs as vfsmod, ) -from .utils import hashutil +from .utils import ( + hashutil, + stringutil, +) + release = lock.release @@ -74,7 +77,7 @@ # Python 2 raises TypeError, Python 3 ValueError. except (TypeError, ValueError) as e: raise error.Abort( - _(b'invalid path %s: %s') % (path, pycompat.bytestr(e)) + _(b'invalid path %s: %s') % (path, stringutil.forcebytestr(e)) ) except OSError: isfile = False