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

  • Committer: Martin Pool
  • Date: 2010-02-09 19:04:02 UTC
  • mfrom: (5010 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@canonical.com-20100209190402-2xbzrchmb4dfi2j7
Resolve conflicts with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
40
40
        super(TestNonAscii, self).setUp()
41
41
        self._check_can_encode_paths()
42
42
 
43
 
        self.addCleanup(setattr, osutils, "_cached_user_encoding",
44
 
            osutils._cached_user_encoding)
45
 
        osutils._cached_user_encoding = self.encoding
 
43
        self.overrideAttr(osutils, '_cached_user_encoding', self.encoding)
46
44
        email = self.info['committer'] + ' <joe@foo.com>'
47
45
        os.environ['BZR_EMAIL'] = email.encode(osutils.get_user_encoding())
48
46
        self.create_base()