2 files changed, 5 insertions, 11 deletions

diff --git a/src/mailman/rest/configure.zcml b/src/mailman/rest/configure.zcml
index 143392499..83ad4ff00 100644
--- a/src/mailman/rest/configure.zcml
+++ b/src/mailman/rest/configure.zcml
@@ -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"
     />
diff --git a/src/mailman/rest/webservice.py b/src/mailman/rest/webservice.py
index 054b04ae9..e1b5502d7 100644
--- a/src/mailman/rest/webservice.py
+++ b/src/mailman/rest/webservice.py
@@ -34,9 +34,8 @@ import logging
 # 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 @@ log = logging.getLogger('mailman.http')
 
 
 
-# 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 @@ class AdminWebServiceApplication:
         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)