/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_commit.py

  • Committer: Andrew Bennetts
  • Date: 2008-10-27 06:14:45 UTC
  • mfrom: (3793 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3795.
  • Revision ID: andrew.bennetts@canonical.com-20081027061445-eqt9lz6uw1mbvq4g
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_commit.py
20
20
import os
21
21
import sys
22
22
 
23
 
import bzrlib
24
23
from bzrlib import (
25
24
    osutils,
26
25
    ignores,
248
247
        # LANG env variable has no effect on Windows
249
248
        # but some characters anyway cannot be represented
250
249
        # in default user encoding
251
 
        char = probe_bad_non_ascii(bzrlib.user_encoding)
 
250
        char = probe_bad_non_ascii(osutils.get_user_encoding())
252
251
        if char is None:
253
252
            raise TestSkipped('Cannot find suitable non-ascii character'
254
 
                'for user_encoding (%s)' % bzrlib.user_encoding)
 
253
                'for user_encoding (%s)' % osutils.get_user_encoding())
255
254
        out,err = self.run_bzr_subprocess('commit -m "%s"' % char,
256
255
                                          retcode=1,
257
256
                                          env_changes={'LANG': 'C'})