util: fix %-formatting on docstring by moving a closing parenthesis
authorAugie Fackler <augie@google.com>
Mon, 03 Apr 2017 19:03:34 -0400
changeset 31811 d955b02d8ec6
parent 31810 81abd0d12c86
child 31812 71e3eec9b9fb
util: fix %-formatting on docstring by moving a closing parenthesis We have to do the % formatting over the sysstr, since the things we're going to splat into it are themselves sysstrs. This is probably technically wrong-ish, since bt is probably actually a bytestr here, but this fixes the immediate issue, which was that hg was broken on Python 3.
mercurial/util.py
--- a/mercurial/util.py	Sun Apr 02 22:16:03 2017 +0900
+++ b/mercurial/util.py	Mon Apr 03 19:03:34 2017 -0400
@@ -3705,8 +3705,8 @@
         if not bt or not bt[0]:
             continue
 
-        doc = pycompat.sysstr('``%s``\n    %s' % (
-            bt[0], engine.bundletype.__doc__))
+        doc = pycompat.sysstr('``%s``\n    %s') % (
+            bt[0], engine.bundletype.__doc__)
 
         value = docobject()
         value.__doc__ = doc