/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-02-21 04:28:46 UTC
  • mfrom: (7494 work)
  • mto: This revision was merged to the branch mainline in revision 7496.
  • Revision ID: jelmer@jelmer.uk-20200221042846-r8lzqu0jetkw772i
Merge trunk.

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
26
25
from ..test_plugins import (
27
26
    BaseTestPlugins,
28
27
    )
32
31
 
33
32
    def run_bzr_utf8_out(self, *args, **kwargs):
34
33
        out, _ = self.run_bzr(*args, **kwargs)
35
 
        if PY3:
36
 
            return out
37
 
        else:
38
 
            return out.decode('utf-8')
 
34
        return out
39
35
 
40
36
    def split_help_commands(self):
41
37
        help = {}