← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Aaron Bentley
  • Date: 2006-08-06 23:35:09 UTC
  • mfrom: (1861.4.3 bzr.email)
  • mto: This revision was merged to the branch mainline in revision 1908.
  • Revision ID: aaron.bentley@utoronto.ca-20060806233509-f15a1e9dffa2ecc0
Moy: change BZREMAIL to BZR_EMAIL

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_non_ascii.py
31
31
 
32
32
    def setUp(self):
33
33
        super(TestNonAscii, self).setUp()
34
 
        self._orig_email = os.environ.get('BZREMAIL', None)
 
34
        self._orig_email = os.environ.get('BZR_EMAIL', None)
35
35
        self._orig_encoding = bzrlib.user_encoding
36
36
 
37
37
        bzrlib.user_encoding = self.encoding
38
38
        email = self.info['committer'] + ' <joe@foo.com>'
39
 
        os.environ['BZREMAIL'] = email.encode(bzrlib.user_encoding)
 
39
        os.environ['BZR_EMAIL'] = email.encode(bzrlib.user_encoding)
40
40
        self.create_base()
41
41
 
42
42
    def tearDown(self):
43
43
        if self._orig_email is not None:
44
 
            os.environ['BZREMAIL'] = self._orig_email
 
44
            os.environ['BZR_EMAIL'] = self._orig_email
45
45
        else:
46
 
            if os.environ.get('BZREMAIL', None) is not None:
47
 
                del os.environ['BZREMAIL']
 
46
            if os.environ.get('BZR_EMAIL', None) is not None:
 
47
                del os.environ['BZR_EMAIL']
48
48
        bzrlib.user_encoding = self._orig_encoding
49
49
        super(TestNonAscii, self).tearDown()
50
50