← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_msgeditor.py

  • Committer: John Arbash Meinel
  • Date: 2008-10-30 00:55:00 UTC
  • mto: (3815.2.5 prepare-1.9)
  • mto: This revision was merged to the branch mainline in revision 3811.
  • Revision ID: john@arbash-meinel.com-20081030005500-r5cej1cxflqhs3io
Switch so that we are using a simple timestamp as the first action.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_msgeditor.py
20
20
import os
21
21
import sys
22
22
 
23
 
import bzrlib
24
23
from bzrlib import (
25
24
    errors,
26
25
    msgeditor,
27
26
    osutils,
 
27
    tests,
28
28
    )
29
29
from bzrlib.branch import Branch
30
30
from bzrlib.config import ensure_config_dir_exists, config_filename
257
257
        self.assertFileEqual(expected, msgfilename)
258
258
 
259
259
    def test__create_temp_file_with_commit_template_in_unicode_dir(self):
260
 
        from bzrlib.tests.test_diff import UnicodeFilename
261
 
        self.requireFeature(UnicodeFilename)
 
260
        self.requireFeature(tests.UnicodeFilenameFeature)
262
261
        if hasattr(self, 'info'):
263
262
            os.mkdir(self.info['directory'])
264
263
            os.chdir(self.info['directory'])
280
279
            # LANG env variable has no effect on Windows
281
280
            # but some characters anyway cannot be represented
282
281
            # in default user encoding
283
 
            char = probe_bad_non_ascii(bzrlib.user_encoding)
 
282
            char = probe_bad_non_ascii(osutils.get_user_encoding())
284
283
            if char is None:
285
284
                raise TestSkipped('Cannot find suitable non-ascii character '
286
 
                    'for user_encoding (%s)' % bzrlib.user_encoding)
 
285
                    'for user_encoding (%s)' % osutils.get_user_encoding())
287
286
 
288
287
            self.make_fake_editor(message=char)
289
288