← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/browser/peoplemerge.py

  • Committer: Curtis Hovey
  • Date: 2011-12-24 17:49:30 UTC
  • mto: This revision was merged to the branch mainline in revision 14602.
  • Revision ID: curtis.hovey@canonical.com-20111224174930-xk1d5cvhyxq46ctf
Moved webapp to lp.services.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/browser/peoplemerge.py
19
19
from zope.security.proxy import removeSecurityProxy
20
20
 
21
21
from lp import _
 
22
from lp.services.verification.interfaces.authtoken import LoginTokenType
 
23
from lp.services.verification.interfaces.logintoken import ILoginTokenSet
 
24
from lp.services.database.lpstorm import IMasterObject
 
25
from lp.services.webapp import (
 
26
    canonical_url,
 
27
    LaunchpadView,
 
28
    )
 
29
from lp.services.webapp.interfaces import ILaunchBag
22
30
from lp.app.browser.launchpadform import (
23
31
    action,
24
32
    LaunchpadFormView,
34
42
    IPersonSet,
35
43
    IRequestPeopleMerge,
36
44
    )
37
 
from lp.services.database.lpstorm import IMasterObject
38
45
from lp.services.identity.interfaces.emailaddress import (
39
46
    EmailAddressStatus,
40
47
    IEmailAddressSet,
41
48
    )
42
49
from lp.services.propertycache import cachedproperty
43
 
from lp.services.verification.interfaces.authtoken import LoginTokenType
44
 
from lp.services.verification.interfaces.logintoken import ILoginTokenSet
45
 
from lp.services.webapp import (
46
 
    canonical_url,
47
 
    LaunchpadView,
48
 
    )
49
 
from lp.services.webapp.interfaces import ILaunchBag
50
50
from lp.soyuz.enums import ArchiveStatus
51
51
from lp.soyuz.interfaces.archive import IArchiveSet
52
52