← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/model/person.py

  • Committer: William Grant
  • Date: 2011-12-22 05:37:22 UTC
  • mto: This revision was merged to the branch mainline in revision 14581.
  • Revision ID: william.grant@canonical.com-20111222053722-gm6h9zi3lioz00ky
Move librarian stuff from canonical.launchpad to lp.services.librarian. canonical.librarian remains untouched.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/model/person.py
118
118
    sqlvalues,
119
119
    )
120
120
from canonical.launchpad import _
121
 
from canonical.launchpad.database.librarian import LibraryFileAlias
122
 
from lp.services.verification.model.logintoken import LoginToken
123
121
from canonical.launchpad.helpers import (
124
122
    ensure_unicode,
125
123
    get_contact_email_addresses,
126
124
    get_email_template,
127
125
    shortlist,
128
126
    )
129
 
from lp.services.verification.interfaces.authtoken import LoginTokenType
 
127
from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
 
128
from canonical.launchpad.webapp.interfaces import ILaunchBag
 
129
from lp.answers.model.questionsperson import QuestionsPersonMixin
130
130
from lp.app.interfaces.launchpad import (
131
131
    IHasIcon,
132
132
    IHasLogo,
133
133
    IHasMugshot,
134
 
    )
135
 
from lp.services.statistics.interfaces.statistic import (
136
 
    ILaunchpadStatisticSet,
137
 
    )
138
 
from lp.services.verification.interfaces.logintoken import ILoginTokenSet
139
 
from lp.services.database.lpstorm import (
140
 
    IMasterObject,
141
 
    IMasterStore,
142
 
    IStore,
143
 
    )
144
 
from canonical.launchpad.webapp.dbpolicy import MasterDatabasePolicy
145
 
from canonical.launchpad.webapp.interfaces import ILaunchBag
146
 
from lp.answers.model.questionsperson import QuestionsPersonMixin
147
 
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 
134
    ILaunchpadCelebrities,
 
135
    )
148
136
from lp.app.validators.email import valid_email
149
137
from lp.app.validators.name import (
150
138
    sanitize_name,
257
245
    TeamParticipation,
258
246
    )
259
247
from lp.services.database.decoratedresultset import DecoratedResultSet
 
248
from lp.services.database.lpstorm import (
 
249
    IMasterObject,
 
250
    IMasterStore,
 
251
    IStore,
 
252
    )
260
253
from lp.services.identity.interfaces.account import (
261
254
    AccountCreationRationale,
262
255
    AccountStatus,
279
272
    EmailAddress,
280
273
    HasOwnerMixin,
281
274
    )
 
275
from lp.services.librarian.model import LibraryFileAlias
282
276
from lp.services.oauth.model import (
283
277
    OAuthAccessToken,
284
278
    OAuthRequestToken,
293
287
    REDEEMABLE_VOUCHER_STATUSES,
294
288
    VOUCHER_STATUSES,
295
289
    )
 
290
from lp.services.statistics.interfaces.statistic import ILaunchpadStatisticSet
 
291
from lp.services.verification.interfaces.authtoken import LoginTokenType
 
292
from lp.services.verification.interfaces.logintoken import ILoginTokenSet
 
293
from lp.services.verification.model.logintoken import LoginToken
296
294
from lp.services.worlddata.model.language import Language
297
295
from lp.soyuz.enums import (
298
296
    ArchivePurpose,