/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/script.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/script.py
320
320
 
321
321
    def do_brz(self, test_case, input, args):
322
322
        encoding = osutils.get_user_encoding()
323
 
        if sys.version_info[0] == 2:
324
 
            stdout = ui_testing.BytesIOWithEncoding()
325
 
            stderr = ui_testing.BytesIOWithEncoding()
326
 
            stdout.encoding = stderr.encoding = encoding
327
 
 
328
 
            # FIXME: don't call into logging here
329
 
            handler = trace.EncodedStreamHandler(
330
 
                stderr, errors="replace")
331
 
        else:
332
 
            stdout = ui_testing.StringIOWithEncoding()
333
 
            stderr = ui_testing.StringIOWithEncoding()
334
 
            stdout.encoding = stderr.encoding = encoding
335
 
            handler = logging.StreamHandler(stderr)
 
323
        stdout = ui_testing.StringIOWithEncoding()
 
324
        stderr = ui_testing.StringIOWithEncoding()
 
325
        stdout.encoding = stderr.encoding = encoding
 
326
        handler = logging.StreamHandler(stderr)
336
327
        handler.setLevel(logging.INFO)
337
328
 
338
329
        logger = logging.getLogger('')