diff options
| author | Barry Warsaw | 2010-03-03 22:23:39 -0500 |
|---|---|---|
| committer | Barry Warsaw | 2010-03-03 22:23:39 -0500 |
| commit | 088bc1bbb2f21bdfb7df9a52fde841323263d541 (patch) | |
| tree | ea7d2dab552b973cd9e3055a2287ac51a774cda9 /src/mailman/queue | |
| parent | 392f53559b0baacab1fc4cf48d9452f42d318565 (diff) | |
| parent | 1bee98cb58461121af5c4482beb247c6cd503a20 (diff) | |
| download | mailman-088bc1bbb2f21bdfb7df9a52fde841323263d541.tar.gz mailman-088bc1bbb2f21bdfb7df9a52fde841323263d541.tar.zst mailman-088bc1bbb2f21bdfb7df9a52fde841323263d541.zip | |
Merge the Pycon 2010 sprint branch replacing lazr.restful with restish as the
underlying REST framework.
Diffstat (limited to 'src/mailman/queue')
| -rw-r--r-- | src/mailman/queue/docs/rest.txt | 1 | ||||
| -rw-r--r-- | src/mailman/queue/rest.py | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/mailman/queue/docs/rest.txt b/src/mailman/queue/docs/rest.txt index b46f0f304..2df4da9e4 100644 --- a/src/mailman/queue/docs/rest.txt +++ b/src/mailman/queue/docs/rest.txt @@ -14,7 +14,6 @@ The RESTful server can be used to access basic version information. http_etag: "..." mailman_version: GNU Mailman 3.0... (...) python_version: ... - resource_type_link: http://localhost:8001/3.0/#system self_link: http://localhost:8001/3.0/system diff --git a/src/mailman/queue/rest.py b/src/mailman/queue/rest.py index a14f0b081..a7c9727e2 100644 --- a/src/mailman/queue/rest.py +++ b/src/mailman/queue/rest.py @@ -32,7 +32,7 @@ import signal import logging from mailman.queue import Runner -from mailman.rest.webservice import make_server +from mailman.rest.wsgiapp import make_server log = logging.getLogger('mailman.http') |
