diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mailman/rest/configuration.py | 12 | ||||
| -rw-r--r-- | src/mailman/rest/root.py | 64 |
2 files changed, 2 insertions, 74 deletions
diff --git a/src/mailman/rest/configuration.py b/src/mailman/rest/configuration.py index af1f90551..07debb617 100644 --- a/src/mailman/rest/configuration.py +++ b/src/mailman/rest/configuration.py @@ -30,11 +30,10 @@ from zope.interface import implements from mailman import version from mailman.config import config -from mailman.rest.publication import AdminWebServicePublication -from mailman.rest.root import AdminWebServiceRootResource +# pylint: disable-msg=W0232,R0201 class AdminWebServiceConfiguration: """A configuration object for the Mailman admin web service.""" @@ -42,6 +41,7 @@ class AdminWebServiceConfiguration: @property def view_permission(self): + """See `IWebServiceConfiguration`.""" if config.webservice.view_permission.lower() == 'none': return None return config.webservice.view_permission @@ -65,14 +65,6 @@ class AdminWebServiceConfiguration: default_batch_size = 50 max_batch_size = 300 - ## # XXX What's this for? - ## def createRequest(self, body_instream, environ): - ## """See `IWebServiceConfiguration`.""" - ## request = AdminWebServiceRequest(body_instream, environ) - ## request.setPublication( - ## AdminWebServicePublication(AdminWebServiceRootResource())) - ## return request - def get_request_user(self): """See `IWebServiceConfiguration`.""" return None diff --git a/src/mailman/rest/root.py b/src/mailman/rest/root.py deleted file mode 100644 index a6dc26248..000000000 --- a/src/mailman/rest/root.py +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright (C) 2009 by the Free Software Foundation, Inc. -# -# This file is part of GNU Mailman. -# -# GNU Mailman is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# -# GNU Mailman is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# GNU Mailman. If not, see <http://www.gnu.org/licenses/>. - -"""The RESTful service root.""" - -from __future__ import absolute_import, unicode_literals - -__metaclass__ = type -__all__ = [ - 'AdminWebServiceRootResource', - 'AdminWebServiceRootAbsoluteURL', - ] - - -from lazr.restful import ServiceRootResource -from lazr.restful.interfaces import ICollection -from zope.component import adapts -from zope.interface import implements -from zope.publisher.interfaces.browser import IDefaultBrowserLayer -from zope.traversing.browser.interfaces import IAbsoluteURL - -from mailman.config import config -from mailman.core.system import system - - - -class AdminWebServiceRootResource(ServiceRootResource): - """The root of the Mailman RESTful admin web service.""" - - -class AdminWebServiceRootAbsoluteURL: - """A basic implementation of `IAbsoluteURL` for the root object.""" - - implements(IAbsoluteURL) - adapts(AdminWebServiceRootResource, IDefaultBrowserLayer) - - def __init__(self, context, request): - """Initialize with respect to a context and request.""" - # Avoid circular imports. - from mailman.rest.configuration import AdminWebServiceConfiguration - self.webservice_config = AdminWebServiceConfiguration() - self.version = webservice_config.service_version_uri_prefix - self.schema = ('https' if self.webservice_config.use_https else 'http') - self.hostname = config.webservice.hostname - - def __str__(self): - """Return the semi-hard-coded URL to the service root.""" - return '{0.schema}://{0.hostname}/{0.version}'.format(self) - - __call__ = __str__ |
