~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/msgeditor.py

Merge up bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
25
25
 
26
26
import bzrlib
27
27
import bzrlib.config as config
 
28
from bzrlib import osutils
28
29
from bzrlib.errors import BzrError, BadCommitMessageEncoding
29
30
from bzrlib.trace import warning, mutter
30
31
 
204
205
    """
205
206
    import tempfile
206
207
    tmp_fileno, msgfilename = tempfile.mkstemp(prefix='bzr_log.',
207
 
                                               dir=u'.',
 
208
                                               dir='.',
208
209
                                               text=True)
 
210
    msgfilename = osutils.basename(msgfilename)
209
211
    msgfile = os.fdopen(tmp_fileno, 'w')
210
212
    try:
211
213
        if start_message is not None: