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

  • Committer: Vincent Ladeuil
  • Date: 2008-10-02 06:18:42 UTC
  • mfrom: (3757 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3759.
  • Revision ID: v.ladeuil+lp@free.fr-20081002061842-4ctag1pkr7ua9gu2
Fix conflict. Related to moved lines, nice use case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_osutils.py
24
24
import sys
25
25
import time
26
26
 
27
 
import bzrlib
28
27
from bzrlib import (
29
28
    errors,
30
29
    osutils,
1357
1356
        uni_val, env_val = probe_unicode_in_user_encoding()
1358
1357
        if uni_val is None:
1359
1358
            raise TestSkipped('Cannot find a unicode character that works in'
1360
 
                              ' encoding %s' % (bzrlib.user_encoding,))
 
1359
                              ' encoding %s' % (osutils.get_user_encoding(),))
1361
1360
 
1362
1361
        old = osutils.set_or_unset_env('BZR_TEST_ENV_VAR', uni_val)
1363
1362
        self.assertEqual(env_val, os.environ.get('BZR_TEST_ENV_VAR'))