Mercurial > hg > gcmultimerge

changeset 43:a331209e24fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Unicodify.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 14:18:36 +0300
parents ac949d2b268a
children e30f4647913d
files multimerge.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Tue Jul 05 14:15:57 2016 +0300
+++ b/multimerge.py	Tue Jul 05 14:18:36 2016 +0300
@@ -152,7 +152,7 @@
         if name in self.m_data:
             self.m_data[name] = self.mtranslate(name, value)
         else:
-            gcm_fatal("GCMSettings.mset(): No such attribute '"+ name +"'.")
+            gcm_fatal(u"GCMSettings.mset(): No such attribute '"+ name +"'.")
 
     def mget(self, name):
         if name in self.m_data:
@@ -165,7 +165,7 @@
             if cfgparser.has_option(sect, name):
                 value = cfgparser.get(sect, name)
                 self.mset(name, value)
-                gcm_debug("{0} -> '{1}' == {2}".format(name, value, self.mget(name)))
+                gcm_debug(u"{0} -> '{1}' == {2}".format(name, value, self.mget(name)))
 
     def is_str(self, mvalue):
         return isinstance(mvalue, basestring)