← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/browser/tests/test_branchmergeproposal.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/code/browser/tests/test_branchmergeproposal.py
29
29
from zope.security.interfaces import Unauthorized
30
30
from zope.security.proxy import removeSecurityProxy
31
31
 
32
 
from canonical.launchpad.webapp import canonical_url
33
 
from canonical.launchpad.webapp.interfaces import (
 
32
from lp.services.webapp import canonical_url
 
33
from lp.services.webapp.interfaces import (
34
34
    BrowserNotificationLevel,
35
35
    IPrimaryContext,
36
36
    )
37
 
from canonical.launchpad.webapp.servers import LaunchpadTestRequest
38
 
from canonical.launchpad.webapp.testing import verifyObject
 
37
from lp.services.webapp.servers import LaunchpadTestRequest
 
38
from lp.services.webapp.testing import verifyObject
39
39
from canonical.testing.layers import (
40
40
    DatabaseFunctionalLayer,
41
41
    LaunchpadFunctionalLayer,