Patchwork [1,of,3] py3: convert bool variables to bytes

login
register
mail settings
Submitter Pulkit Goyal
Date June 10, 2017, 8:21 a.m.
Message ID <297af7b6e217a3404205.1497082913@workspace>
Download mbox | patch
Permalink /patch/21306/
State Accepted
Headers show

Comments

Pulkit Goyal - June 10, 2017, 8:21 a.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1496402841 -19800
#      Fri Jun 02 16:57:21 2017 +0530
# Node ID 297af7b6e217a340420566daf960dad2dbe5d0a1
# Parent  776d077eb4ef815e08631fb1e7b33375adca3ef1
py3: convert bool variables to bytes

Patch

diff --git a/mercurial/filemerge.py b/mercurial/filemerge.py
--- a/mercurial/filemerge.py
+++ b/mercurial/filemerge.py
@@ -628,7 +628,8 @@ 
         # normalize to new-style names (':merge' etc)
         tool = tool[len('internal'):]
     ui.debug("picked tool '%s' for %s (binary %s symlink %s changedelete %s)\n"
-             % (tool, fd, binary, symlink, changedelete))
+             % (tool, fd, pycompat.bytestr(binary), pycompat.bytestr(symlink),
+                    pycompat.bytestr(changedelete)))
 
     if tool in internals:
         func = internals[tool]