← 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
22
22
from lp.services.verification.interfaces.authtoken import LoginTokenType
23
23
from lp.services.verification.interfaces.logintoken import ILoginTokenSet
24
24
from lp.services.database.lpstorm import IMasterObject
25
 
from canonical.launchpad.webapp import (
 
25
from lp.services.webapp import (
26
26
    canonical_url,
27
27
    LaunchpadView,
28
28
    )
29
 
from canonical.launchpad.webapp.interfaces import ILaunchBag
 
29
from lp.services.webapp.interfaces import ILaunchBag
30
30
from lp.app.browser.launchpadform import (
31
31
    action,
32
32
    LaunchpadFormView,