~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
34
34
    edit_commit_message_encoded
35
35
)
36
36
from bzrlib.tests import (
37
 
    features,
38
37
    TestCaseInTempDir,
39
38
    TestCaseWithTransport,
40
39
    TestNotApplicable,
252
251
        self.overrideEnv('VISUAL', 'visual')
253
252
        self.overrideEnv('EDITOR', 'editor')
254
253
 
255
 
        conf = config.GlobalStack()
256
 
        conf.store._load_from_string('[DEFAULT]\neditor = config_editor\n')
257
 
        conf.store.save()
 
254
        conf = config.GlobalConfig.from_string('editor = config_editor\n',
 
255
                                               save=True)
 
256
 
258
257
        editors = list(msgeditor._get_editor())
259
258
        editors = [editor for (editor, cfg_src) in editors]
260
259
 
310
309
        self.assertFileEqual(expected, msgfilename)
311
310
 
312
311
    def test__create_temp_file_with_commit_template_in_unicode_dir(self):
313
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
312
        self.requireFeature(tests.UnicodeFilenameFeature)
314
313
        if hasattr(self, 'info'):
315
314
            tmpdir = self.info['directory']
316
315
            os.mkdir(tmpdir)