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

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_plugins.py
22
22
from ... import (
23
23
    commands,
24
24
    )
 
25
from ...sixish import PY3
25
26
from ..test_plugins import (
26
27
    BaseTestPlugins,
27
28
    )
31
32
 
32
33
    def run_bzr_utf8_out(self, *args, **kwargs):
33
34
        out, _ = self.run_bzr(*args, **kwargs)
34
 
        return out
 
35
        if PY3:
 
36
            return out
 
37
        else:
 
38
            return out.decode('utf-8')
35
39
 
36
40
    def split_help_commands(self):
37
41
        help = {}