Mercurial > hg > gcmultimerge

changeset 45:035be8a9e982

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Force reading of configuration in Unicode UTF-8.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 05 Jul 2016 14:25:22 +0300
parents e30f4647913d
children 51c87abe5a1e
files multimerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/multimerge.py	Tue Jul 05 14:20:53 2016 +0300
+++ b/multimerge.py	Tue Jul 05 14:25:22 2016 +0300
@@ -11,6 +11,7 @@
 import sys
 import signal
 import re
+import codecs
 #import time
 #import datetime
 
@@ -282,7 +283,7 @@
     gcm_debug("Reading configuration from '{0}'.".format(sys.argv[1]))
     try:
         cfgparser = ConfigParser.RawConfigParser()
-        cfgparser.read(sys.argv[1])
+        cfgparser.readfp(codecs.open(sys.argv[1], "r", "UTF-8"))
     except Exception as e:
         gcm_fatal("Failed to read configuration file '{0}': {1}".format(sys.argv[1], str(e)))