D3071: py3: use pycompat.bytestr() intsead of str
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Wed Apr 4 12:26:56 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3071
AFFECTED FILES
hgext/journal.py
tests/test-arbitraryfilectx.t
CHANGE DETAILS
diff --git a/tests/test-arbitraryfilectx.t b/tests/test-arbitraryfilectx.t
--- a/tests/test-arbitraryfilectx.t
+++ b/tests/test-arbitraryfilectx.t
@@ -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
diff --git a/hgext/journal.py b/hgext/journal.py
--- a/hgext/journal.py
+++ b/hgext/journal.py
@@ -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((
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list