/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/plugins/weave_fmt/workingtree.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/plugins/weave_fmt/workingtree.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
 
21
from io import BytesIO
21
22
 
22
23
from ... import (
23
24
    conflicts as _mod_conflicts,
32
33
    xml5,
33
34
    )
34
35
from ...mutabletree import MutableTree
35
 
from ...sixish import (
36
 
    BytesIO,
37
 
    )
38
36
from ...transport.local import LocalTransport
39
37
from ...workingtree import (
40
38
    WorkingTreeFormat,