Patchwork py3: make format strings unicodes and not bytes

login
register
mail settings
Submitter Pulkit Goyal
Date Oct. 8, 2016, 2:11 p.m.
Message ID <13b2bb4d87e180853a07.1475935909@pulkit-goyal>
Download mbox | patch
Permalink /patch/16922/
State Superseded
Headers show

Comments

Pulkit Goyal - Oct. 8, 2016, 2:11 p.m.
# HG changeset patch
# User Pulkit Goyal <7895pulkit@gmail.com>
# Date 1475935858 -7200
#      Sat Oct 08 16:10:58 2016 +0200
# Node ID 13b2bb4d87e180853a07d2971e068c7ba3521654
# Parent  14da91b1ac26cac422b04a5e41b451e381c75e08
py3: make format strings unicodes and not bytes
Fixes issues on Python 3, wherein docstrings are unicodes.
Shouldn't break anything on Python 2.

Patch

diff -r 14da91b1ac26 -r 13b2bb4d87e1 mercurial/filemerge.py
--- a/mercurial/filemerge.py	Sat Oct 08 08:36:39 2016 -0400
+++ b/mercurial/filemerge.py	Sat Oct 08 16:10:58 2016 +0200
@@ -19,6 +19,7 @@ 
     error,
     formatter,
     match,
+    pycompat,
     scmutil,
     simplemerge,
     tagmerge,
@@ -93,7 +94,7 @@ 
     '''return a decorator for populating internal merge tool table'''
     def decorator(func):
         fullname = ':' + name
-        func.__doc__ = "``%s``\n" % fullname + func.__doc__.strip()
+        func.__doc__ = pycompat.sysstr("``%s``\n" % fullname) + func.__doc__.strip()
         internals[fullname] = func
         internals['internal:' + name] = func
         internalsdoc[fullname] = func