← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/model/branch.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-12-31 00:16:50 UTC
  • mfrom: (14606.3.7 apocaremains)
  • Revision ID: launchpad@pqm.canonical.com-20111231001650-pjeyhfjhm6mg3yp8
[r=wgrant][no-qa] Merge canonical.database into lp.services.database.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/model/branch.py
47
47
    removeSecurityProxy,
48
48
    )
49
49
 
50
 
from lp.services.config import config
51
 
from canonical.database.constants import (
52
 
    DEFAULT,
53
 
    UTC_NOW,
54
 
    )
55
 
from canonical.database.datetimecol import UtcDateTimeCol
56
 
from canonical.database.enumcol import EnumCol
57
 
from canonical.database.sqlbase import (
58
 
    SQLBase,
59
 
    sqlvalues,
60
 
    )
61
50
from lp import _
62
 
from lp.services.helpers import shortlist
63
 
from lp.app.interfaces.launchpad import IPrivacy
64
 
from lp.services.database.lpstorm import IMasterStore
65
 
from lp.services.webapp import urlappend
66
51
from lp.app.errors import UserCannotUnsubscribePerson
67
 
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 
52
from lp.app.interfaces.launchpad import (
 
53
    ILaunchpadCelebrities,
 
54
    IPrivacy,
 
55
    )
68
56
from lp.bugs.interfaces.bugtask import (
69
57
    BugTaskSearchParams,
70
58
    IBugTaskSet,
143
131
    validate_person,
144
132
    validate_public_person,
145
133
    )
 
134
from lp.services.config import config
146
135
from lp.services.database.bulk import load_related
 
136
from lp.services.database.constants import (
 
137
    DEFAULT,
 
138
    UTC_NOW,
 
139
    )
 
140
from lp.services.database.datetimecol import UtcDateTimeCol
147
141
from lp.services.database.decoratedresultset import DecoratedResultSet
 
142
from lp.services.database.enumcol import EnumCol
 
143
from lp.services.database.lpstorm import IMasterStore
 
144
from lp.services.database.sqlbase import (
 
145
    SQLBase,
 
146
    sqlvalues,
 
147
    )
 
148
from lp.services.helpers import shortlist
148
149
from lp.services.job.interfaces.job import JobStatus
149
150
from lp.services.job.model.job import Job
150
151
from lp.services.mail.notificationrecipientset import NotificationRecipientSet
151
152
from lp.services.propertycache import cachedproperty
 
153
from lp.services.webapp import urlappend
152
154
 
153
155
 
154
156
class Branch(SQLBase, BzrIdentityMixin):