/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/test_diff.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/test_diff.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
import contextlib
 
18
from io import BytesIO
17
19
import os
18
20
import re
19
21
import subprocess
21
23
import tempfile
22
24
 
23
25
from .. import (
24
 
    cleanup,
25
26
    diff,
26
27
    errors,
27
28
    osutils,
30
31
    revisiontree,
31
32
    tests,
32
33
    )
33
 
from ..sixish import (
34
 
    BytesIO,
35
 
    unichr,
36
 
    )
37
34
from ..tests import (
38
35
    features,
39
36
    EncodingAdapter,
1031
1028
 
1032
1029
    def call_gtabtd(self, path_list, revision_specs, old_url, new_url):
1033
1030
        """Call get_trees_and_branches_to_diff_locked."""
1034
 
        exit_stack = cleanup.ExitStack()
 
1031
        exit_stack = contextlib.ExitStack()
1035
1032
        self.addCleanup(exit_stack.close)
1036
1033
        return diff.get_trees_and_branches_to_diff_locked(
1037
1034
            path_list, revision_specs, old_url, new_url, exit_stack)