Bzr using encoding: 'utf-8' === modified file 'bzrlib/msgeditor.py' --- bzrlib/msgeditor.py 2006-11-11 19:25:25 +0000 +++ bzrlib/msgeditor.py 2007-02-07 16:56:28 +0000 @@ -23,8 +23,10 @@ from subprocess import call import sys -import bzrlib -import bzrlib.config as config +from bzrlib import ( + config, + osutils, + ) from bzrlib.errors import BzrError from bzrlib.trace import warning, mutter @@ -95,24 +97,26 @@ msgfilename = None try: - tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', dir=u'.') + user_encoding = osutils.get_user_encoding() + tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.', + dir=osutils.getcwdu()) msgfile = os.close(tmp_fileno) if infotext is not None and infotext != "": hasinfo = True msgfile = file(msgfilename, "w") msgfile.write("\n\n%s\n\n%s" % (ignoreline, - infotext.encode(bzrlib.user_encoding, 'replace'))) + infotext.encode(user_encoding, 'replace'))) msgfile.close() else: hasinfo = False if not _run_editor(msgfilename): return None - + started = False msg = [] lastline, nlines = 0, 0 - for line in codecs.open(msgfilename, 'r', bzrlib.user_encoding): + for line in codecs.open(msgfilename, 'r', user_encoding): stripped_line = line.strip() # strip empty line before the log message starts if not started: