------------------------------------------------------------
revno: 6776
committer: Barry Warsaw <[email protected]>
branch nick: 3.0
timestamp: Mon 2009-08-17 14:40:03 -0400
message:
We don't need the AadminWebServiceRequest any more.
modified:
src/mailman/rest/configure.zcml
src/mailman/rest/webservice.py
--
lp:mailman
https://code.launchpad.net/~mailman-coders/mailman/3.0
Your team Mailman Checkins is subscribed to branch lp:mailman.
To unsubscribe from this branch go to
https://code.launchpad.net/~mailman-coders/mailman/3.0/+edit-subscription.
=== modified file 'src/mailman/rest/configure.zcml'
--- src/mailman/rest/configure.zcml 2009-07-25 04:23:01 +0000
+++ src/mailman/rest/configure.zcml 2009-08-17 18:40:03 +0000
@@ -22,21 +22,21 @@
<adapter
for="mailman.interfaces.domain.IDomain
- mailman.rest.webservice.AdminWebServiceRequest"
+ lazr.restful.simple.Request"
provides="zope.traversing.browser.interfaces.IAbsoluteURL"
factory="mailman.rest.urls.DomainURLMapper"
/>
<adapter
for="zope.interface.Interface
- mailman.rest.webservice.AdminWebServiceRequest"
+ lazr.restful.simple.Request"
provides="zope.traversing.browser.interfaces.IAbsoluteURL"
factory="mailman.rest.urls.FallbackURLMapper"
/>
<adapter
for="mailman.interfaces.mailinglist.IMailingList
- mailman.rest.webservice.AdminWebServiceRequest"
+ lazr.restful.simple.Request"
provides="zope.traversing.browser.interfaces.IAbsoluteURL"
factory="mailman.rest.urls.MailingListURLMapper"
/>
=== modified file 'src/mailman/rest/webservice.py'
--- src/mailman/rest/webservice.py 2009-08-06 21:20:02 +0000
+++ src/mailman/rest/webservice.py 2009-08-17 18:40:03 +0000
@@ -34,9 +34,8 @@
# proper Mailman logger instead of stderr, as is the default.
from wsgiref.simple_server import WSGIServer, WSGIRequestHandler
-from lazr.restful.publisher import WebServiceRequestTraversal
+from lazr.restful.simple import Request
from zope.interface import implements
-from zope.publisher.browser import BrowserRequest
from zope.publisher.publish import publish
from mailman.config import config
@@ -49,11 +48,6 @@
-# pylint: disable-msg=W0232
-class AdminWebServiceRequest(WebServiceRequestTraversal, BrowserRequest):
- """A request for the admin REST interface."""
-
-
class AdminWebServiceApplication:
"""A WSGI application for the admin REST interface."""
@@ -67,7 +61,7 @@
environ = self.environ
# Create the request based on the HTTP method used.
method = environ.get('REQUEST_METHOD', 'GET').upper()
- request = AdminWebServiceRequest(environ['wsgi.input'], environ)
+ request = Request(environ['wsgi.input'], environ)
request.setPublication(AdminWebServicePublication(self))
# Support post-mortem debugging.
handle_errors = environ.get('wsgi.handleErrors', True)
_______________________________________________
Mailman-checkins mailing list
[email protected]
Unsubscribe:
http://mail.python.org/mailman/options/mailman-checkins/archive%40jab.org
