Patchwork [4,of,6,py3] ui: fix opts labeling on ui.warn et al for Python 3

login
register
mail settings
Submitter Augie Fackler
Date March 3, 2017, 7:30 p.m.
Message ID <224bce12f19ec6fb7ab1.1488569407@imladris.local>
Download mbox | patch
Permalink /patch/18897/
State Accepted
Headers show

Comments

Augie Fackler - March 3, 2017, 7:30 p.m.
# HG changeset patch
# User Augie Fackler <raf@durin42.com>
# Date 1488568104 18000
#      Fri Mar 03 14:08:24 2017 -0500
# Node ID 224bce12f19ec6fb7ab1563797d81e902121dcb6
# Parent  2ab40e1c47207da01974913a46796967e19242bd
ui: fix opts labeling on ui.warn et al for Python 3

This is a step towards fixing extension load warnings on Python 3.

Patch

diff --git a/mercurial/ui.py b/mercurial/ui.py
--- a/mercurial/ui.py
+++ b/mercurial/ui.py
@@ -1212,14 +1212,14 @@  class ui(object):
         This adds an output label of "ui.status".
         '''
         if not self.quiet:
-            opts['label'] = opts.get('label', '') + ' ui.status'
+            opts[u'label'] = opts.get(u'label', '') + ' ui.status'
             self.write(*msg, **opts)
     def warn(self, *msg, **opts):
         '''write warning message to output (stderr)
 
         This adds an output label of "ui.warning".
         '''
-        opts['label'] = opts.get('label', '') + ' ui.warning'
+        opts[u'label'] = opts.get(u'label', '') + ' ui.warning'
         self.write_err(*msg, **opts)
     def note(self, *msg, **opts):
         '''write note to output (if ui.verbose is True)
@@ -1227,7 +1227,7 @@  class ui(object):
         This adds an output label of "ui.note".
         '''
         if self.verbose:
-            opts['label'] = opts.get('label', '') + ' ui.note'
+            opts[u'label'] = opts.get(u'label', '') + ' ui.note'
             self.write(*msg, **opts)
     def debug(self, *msg, **opts):
         '''write debug message to output (if ui.debugflag is True)
@@ -1235,7 +1235,7 @@  class ui(object):
         This adds an output label of "ui.debug".
         '''
         if self.debugflag:
-            opts['label'] = opts.get('label', '') + ' ui.debug'
+            opts[u'label'] = opts.get(u'label', '') + ' ui.debug'
             self.write(*msg, **opts)
 
     def edit(self, text, user, extra=None, editform=None, pending=None,