← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/services/webapp/servers.py

Merged fix-retest-colorize into redo-read-only-transactions-in-buildmaster, resolving several import conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/services/webapp/servers.py
61
61
from zope.server.http.wsgihttpserver import PMDBWSGIHTTPServer
62
62
from zope.session.interfaces import ISession
63
63
 
64
 
from canonical.config import config
65
 
from lp.app.interfaces.launchpad import (
66
 
    IPrivateApplication,
 
64
from lp.app.errors import UnexpectedFormData
 
65
import lp.layers
 
66
from lp.services.config import config
 
67
from lp.services.features import get_relevant_feature_controller
 
68
from lp.services.features.flags import NullFeatureController
 
69
from lp.services.feeds.interfaces.application import IFeedsApplication
 
70
from lp.services.feeds.interfaces.feed import IFeed
 
71
from lp.services.oauth.interfaces import (
 
72
    IOAuthConsumerSet,
 
73
    IOAuthSignedRequest,
 
74
    TokenException,
67
75
    )
68
 
import canonical.launchpad.layers
69
 
from canonical.launchpad.webapp.authentication import (
 
76
from lp.services.propertycache import cachedproperty
 
77
from lp.services.webapp.authentication import (
70
78
    check_oauth_signature,
71
79
    get_oauth_authorization,
72
80
    )
73
 
from canonical.launchpad.webapp.authorization import (
 
81
from lp.services.webapp.authorization import (
74
82
    LAUNCHPAD_SECURITY_POLICY_CACHE_KEY,
75
83
    )
76
 
from canonical.launchpad.webapp.errorlog import ErrorReportRequest
77
 
from canonical.launchpad.webapp.interfaces import (
 
84
from lp.services.webapp.errorlog import ErrorReportRequest
 
85
from lp.services.webapp.interfaces import (
78
86
    FinishReadOnlyRequestEvent,
79
87
    IAPIDocRoot,
80
88
    IBasicLaunchpadRequest,
87
95
    IPlacelessLoginSource,
88
96
    OAuthPermission,
89
97
    )
90
 
from canonical.launchpad.webapp.notifications import (
 
98
from lp.services.webapp.notifications import (
91
99
    NotificationList,
92
100
    NotificationRequest,
93
101
    NotificationResponse,
94
102
    )
95
 
from canonical.launchpad.webapp.opstats import OpStats
96
 
from canonical.launchpad.webapp.publication import LaunchpadBrowserPublication
97
 
from canonical.launchpad.webapp.publisher import (
 
103
from lp.services.webapp.opstats import OpStats
 
104
from lp.services.webapp.publication import LaunchpadBrowserPublication
 
105
from lp.services.webapp.publisher import (
98
106
    get_current_browser_request,
99
107
    RedirectionView,
100
108
    )
101
 
from canonical.launchpad.webapp.vhosts import allvhosts
102
 
from canonical.lazr.interfaces.feed import IFeed
103
 
from lp.app.errors import UnexpectedFormData
104
 
from lp.services.features import get_relevant_feature_controller
105
 
from lp.services.features.flags import NullFeatureController
106
 
from lp.services.feeds.interfaces import IFeedsApplication
107
 
from lp.services.oauth.interfaces import (
108
 
    IOAuthConsumerSet,
109
 
    IOAuthSignedRequest,
110
 
    TokenException,
111
 
    )
112
 
from lp.services.propertycache import cachedproperty
 
109
from lp.services.webapp.vhosts import allvhosts
113
110
from lp.services.webservice.interfaces import IWebServiceApplication
114
111
from lp.testopenid.interfaces.server import ITestOpenIDApplication
 
112
from lp.xmlrpc.interfaces import IPrivateApplication
115
113
 
116
114
 
117
115
class StepsToGo:
617
615
 
618
616
    implements(
619
617
        ILaunchpadBrowserApplicationRequest, ISynchronizer,
620
 
        canonical.launchpad.layers.LaunchpadLayer)
 
618
        lp.layers.LaunchpadLayer)
621
619
 
622
620
    retry_max_count = 5    # How many times we're willing to retry
623
621
 
827
825
    It provides LaunchpadLayer and adds a mock INotificationRequest
828
826
    implementation.
829
827
 
830
 
    >>> canonical.launchpad.layers.LaunchpadLayer.providedBy(request)
 
828
    >>> lp.layers.LaunchpadLayer.providedBy(request)
831
829
    True
832
830
    >>> INotificationRequest.providedBy(request)
833
831
    True
862
860
    """
863
861
    implements(
864
862
        INotificationRequest, IBasicLaunchpadRequest, IParticipation,
865
 
        canonical.launchpad.layers.LaunchpadLayer)
 
863
        lp.layers.LaunchpadLayer)
866
864
 
867
865
    # These two attributes satisfy IParticipation.
868
866
    principal = None
961
959
        """See zope.app.publication.interfaces.IPublicationRequestFactory"""
962
960
        assert output_stream is None, 'output_stream is deprecated in Z3.2'
963
961
 
964
 
        # Mark the request with the 'canonical.launchpad.layers.debug' layer
 
962
        # Mark the request with the 'lp.layers.debug' layer
965
963
        request = HTTPPublicationRequestFactory.__call__(
966
964
            self, input_stream, env)
967
 
        canonical.launchpad.layers.setFirstLayer(
968
 
            request, canonical.launchpad.layers.DebugLayer)
 
965
        lp.layers.setFirstLayer(
 
966
            request, lp.layers.DebugLayer)
969
967
        return request
970
968
 
971
969
 
1124
1122
 
1125
1123
class FeedsBrowserRequest(LaunchpadBrowserRequest):
1126
1124
    """Request type for a launchpad feed."""
1127
 
    implements(canonical.launchpad.layers.FeedsLayer)
 
1125
    implements(lp.layers.FeedsLayer)
1128
1126
 
1129
1127
 
1130
1128
# ---- apidoc
1131
1129
 
1132
1130
class APIDocBrowserRequest(LaunchpadBrowserRequest):
1133
 
    implements(canonical.launchpad.layers.APIDocLayer)
 
1131
    implements(lp.layers.APIDocLayer)
1134
1132
 
1135
1133
 
1136
1134
class APIDocBrowserPublication(LaunchpadBrowserPublication):
1140
1138
# ---- testopenid
1141
1139
 
1142
1140
class TestOpenIDBrowserRequest(LaunchpadBrowserRequest):
1143
 
    implements(canonical.launchpad.layers.TestOpenIDLayer)
 
1141
    implements(lp.layers.TestOpenIDLayer)
1144
1142
 
1145
1143
 
1146
1144
class TestOpenIDBrowserPublication(LaunchpadBrowserPublication):
1309
1307
 
1310
1308
 
1311
1309
class LaunchpadWebServiceRequestTraversal(WebServiceRequestTraversal):
1312
 
    implements(canonical.launchpad.layers.WebServiceLayer)
 
1310
    implements(lp.layers.WebServiceLayer)
1313
1311
 
1314
1312
    def getRootURL(self, rootsite):
1315
1313
        """See IBasicLaunchpadRequest."""