← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_propose.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_propose.py
20
20
 
21
21
from bzrlib import (
22
22
    errors,
 
23
    hooks,
23
24
    msgeditor,
24
25
)
25
 
from bzrlib.hooks import HookPoint, Hooks
26
26
from bzrlib.plugins.launchpad import (
27
27
    lp_api,
28
28
    lp_registration,
31
31
from lazr.restfulclient import errors as restful_errors
32
32
 
33
33
 
34
 
class ProposeMergeHooks(Hooks):
 
34
class ProposeMergeHooks(hooks.Hooks):
35
35
    """Hooks for proposing a merge on Launchpad."""
36
36
 
37
37
    def __init__(self):
38
 
        Hooks.__init__(self)
 
38
        hooks.Hooks.__init__(self)
39
39
        self.create_hook(
40
 
            HookPoint(
 
40
            hooks.HookPoint(
41
41
                'get_prerequisite',
42
42
                "Return the prerequisite branch for proposing as merge.",
43
43
                (2, 1), None),
44
44
        )
45
45
        self.create_hook(
46
 
            HookPoint(
 
46
            hooks.HookPoint(
47
47
                'merge_proposal_body',
48
48
                "Return an initial body for the merge proposal message.",
49
49
                (2, 1), None),