Mercurial > hg
changeset 37318:9954d0e2ad00
py3: use pycompat.bytestr() intsead of str
Differential Revision: https://phab.mercurial-scm.org/D3071
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 02 Apr 2018 17:06:42 +0530 |
| parents | 14da486e820d |
| children | 36d17f37db91 |
| files | hgext/journal.py tests/test-arbitraryfilectx.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/journal.py Mon Mar 19 12:46:56 2018 +0530 +++ b/hgext/journal.py Mon Apr 02 17:06:42 2018 +0530 @@ -226,7 +226,7 @@ def __bytes__(self): """bytes representation for storage""" - time = ' '.join(map(str, self.timestamp)) + time = ' '.join(map(pycompat.bytestr, self.timestamp)) oldhashes = ','.join([node.hex(hash) for hash in self.oldhashes]) newhashes = ','.join([node.hex(hash) for hash in self.newhashes]) return '\n'.join((
--- a/tests/test-arbitraryfilectx.t Mon Mar 19 12:46:56 2018 +0530 +++ b/tests/test-arbitraryfilectx.t Mon Apr 02 17:06:42 2018 +0530 @@ -2,13 +2,13 @@ $ cat > eval.py <<EOF > from __future__ import absolute_import > import filecmp - > from mercurial import commands, context, registrar + > from mercurial import commands, context, pycompat, registrar > cmdtable = {} > command = registrar.command(cmdtable) > @command(b'eval', [], b'hg eval CMD') > def eval_(ui, repo, *cmds, **opts): > cmd = b" ".join(cmds) - > res = str(eval(cmd, globals(), locals())) + > res = pycompat.bytestr(eval(cmd, globals(), locals())) > ui.warn(b"%s" % res) > EOF