/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/__init__.py

  • Committer: Andrew Bennetts
  • Date: 2008-02-18 23:26:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080218232627-v6cuj0596nh3rw56
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
1383
1383
    def _run_bzr_core(self, args, retcode, encoding, stdin,
1384
1384
            working_dir):
1385
1385
        if encoding is None:
1386
 
            encoding = bzrlib.user_encoding
 
1386
            encoding = osutils.get_user_encoding()
1387
1387
        stdout = StringIOWrapper()
1388
1388
        stderr = StringIOWrapper()
1389
1389
        stdout.encoding = encoding
3018
3018
    possible_vals = [u'm\xb5', u'\xe1', u'\u0410']
3019
3019
    for uni_val in possible_vals:
3020
3020
        try:
3021
 
            str_val = uni_val.encode(bzrlib.user_encoding)
 
3021
            str_val = uni_val.encode(osutils.get_user_encoding())
3022
3022
        except UnicodeEncodeError:
3023
3023
            # Try a different character
3024
3024
            pass