Mercurial > hg-stable
changeset 36267:6ea0b78ddcac
py3: use util.forcebytestr instead of str for converting errors to bytes
Differential Revision: https://phab.mercurial-scm.org/D2269
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Wed, 14 Feb 2018 17:43:33 +0530 |
| parents | ddeb7653b31c |
| children | 257f3651ada9 |
| files | hgext/transplant.py mercurial/patch.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/transplant.py Wed Feb 14 16:37:46 2018 +0530 +++ b/hgext/transplant.py Wed Feb 14 17:43:33 2018 +0530 @@ -311,7 +311,7 @@ p1 = repo.dirstate.p1() p2 = node self.log(user, date, message, p1, p2, merge=merge) - self.ui.write(str(inst) + '\n') + self.ui.write(util.forcebytestr(inst) + '\n') raise TransplantError(_('fix up the working directory and run ' 'hg transplant --continue')) else:
--- a/mercurial/patch.py Wed Feb 14 16:37:46 2018 +0530 +++ b/mercurial/patch.py Wed Feb 14 17:43:33 2018 +0530 @@ -1459,7 +1459,7 @@ dec.append(util.b85decode(line[1:])[:l]) except ValueError as e: raise PatchError(_('could not decode "%s" binary patch: %s') - % (self._fname, str(e))) + % (self._fname, util.forcebytestr(e))) line = getline(lr, self.hunk) text = zlib.decompress(''.join(dec)) if len(text) != size: