← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/interfaces/branchmergeproposal.py

  • Committer: Curtis Hovey
  • Date: 2011-12-28 17:03:06 UTC
  • mto: This revision was merged to the branch mainline in revision 14605.
  • Revision ID: curtis.hovey@canonical.com-20111228170306-n9fz94h85ckaoaf3
Separate test-authoring classes from test-running classes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/interfaces/branchmergeproposal.py
67
67
    TextLine,
68
68
    )
69
69
 
 
70
from canonical.database.constants import DEFAULT
70
71
from lp import _
71
72
from lp.app.interfaces.launchpad import IPrivacy
 
73
from lp.services.webapp.interfaces import ITableBatchNavigator
72
74
from lp.code.enums import (
73
75
    BranchMergeProposalStatus,
74
76
    CodeReviewVote,
76
78
from lp.code.interfaces.branch import IBranch
77
79
from lp.code.interfaces.diff import IPreviewDiff
78
80
from lp.registry.interfaces.person import IPerson
79
 
from lp.services.database.constants import DEFAULT
80
81
from lp.services.fields import (
81
82
    PersonChoice,
82
83
    PublicPersonChoice,
89
90
    IRunnableJob,
90
91
    ITwistedJobSource,
91
92
    )
92
 
from lp.services.webapp.interfaces import ITableBatchNavigator
93
93
 
94
94
 
95
95
BRANCH_MERGE_PROPOSAL_FINAL_STATES = (