# HG changeset patch # User Joerg Sonnenberger # Date 2020-07-02 17:54:44 # Node ID 36ea1442b7bc624245607dcfe52d9a87f6d0a827 # Parent 3707f6e7e04e071c7a87f781718701b28bd9a877 ui: fix Python 2.7 support for ui.timestamp-output Differential Revision: https://phab.mercurial-scm.org/D8675 diff --git a/mercurial/ui.py b/mercurial/ui.py --- a/mercurial/ui.py +++ b/mercurial/ui.py @@ -1229,7 +1229,8 @@ class ui(object): } if timestamp: args = ( - b'[%s] ' % bytes(datetime.datetime.now().isoformat(), 'ASCII'), + b'[%s] ' + % pycompat.bytestr(datetime.datetime.now().isoformat()), ) + args _writemsgwith(self._write, dest, *args, **opts) if timestamp: