/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/merge_directive.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/merge_directive.py
17
17
from __future__ import absolute_import
18
18
 
19
19
import base64
 
20
import contextlib
 
21
from io import BytesIO
20
22
import re
21
23
 
22
24
from . import lazy_import
23
25
lazy_import.lazy_import(globals(), """
24
26
from breezy import (
25
27
    branch as _mod_branch,
26
 
    cleanup,
27
28
    diff,
28
29
    email_message,
29
30
    gpg,
44
45
from . import (
45
46
    errors,
46
47
    )
47
 
from .sixish import (
48
 
    BytesIO,
49
 
    )
50
48
 
51
49
 
52
50
class MergeRequestBodyParams(object):
599
597
        If the message is not supplied, the message from revision_id will be
600
598
        used for the commit.
601
599
        """
602
 
        with cleanup.ExitStack() as exit_stack:
 
600
        with contextlib.ExitStack() as exit_stack:
603
601
            exit_stack.enter_context(repository.lock_write())
604
602
            t_revision_id = revision_id
605
603
            if revision_id == b'null:':