/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 breezy/tests/blackbox/test_non_ascii.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-02-14 03:16:54 UTC
  • mfrom: (7479.2.3 no-more-python2)
  • Revision ID: breezy.the.bot@gmail.com-20200214031654-bp1xtv2jr9nmhto3
Drop python2 support.

Merged from https://code.launchpad.net/~jelmer/brz/no-more-python2/+merge/378694

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_non_ascii.py
24
24
    tests,
25
25
    urlutils,
26
26
    )
27
 
from breezy.sixish import PY3
28
27
from breezy.tests import EncodingAdapter
29
28
from breezy.tests.scenarios import load_tests_apply_scenarios
30
29
 
43
42
 
44
43
        self.overrideAttr(osutils, '_cached_user_encoding', self.encoding)
45
44
        email = self.info['committer'] + ' <joe@foo.com>'
46
 
        if sys.version_info[0] == 2:
47
 
            self.overrideEnv('BRZ_EMAIL', email.encode(
48
 
                osutils.get_user_encoding()))
49
 
        else:
50
 
            self.overrideEnv('BRZ_EMAIL', email)
 
45
        self.overrideEnv('BRZ_EMAIL', email)
51
46
        self.create_base()
52
47
 
53
48
    def run_bzr_decode(self, args, encoding=None, fail=False, retcode=None,