diff options
| -rw-r--r-- | src/mailman/rest/docs/basic.txt | 11 | ||||
| -rw-r--r-- | src/mailman/rest/testing/server.py | 2 | ||||
| -rw-r--r-- | src/mailman/rest/urls.py | 2 | ||||
| -rw-r--r-- | src/mailman/rest/webservice.py | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/src/mailman/rest/docs/basic.txt b/src/mailman/rest/docs/basic.txt index 7afa7a120..a3ee56568 100644 --- a/src/mailman/rest/docs/basic.txt +++ b/src/mailman/rest/docs/basic.txt @@ -15,13 +15,12 @@ major and minor version numbers are in the URL. System information can be retrieved from the server. By default JSON is returned. - >>> dump_json('http://localhost:8001/3.0/sys') - http_etag: "b49c76fb07102f7d56884268c46091367fef180d" - mailman_version: GNU Mailman 3.0.0a3 (Working Man) - python_version: 2.6.2+ (release26-maint:71636:71637, Apr 15 2009, 20:51:2) - [GCC 4.0.1 (Apple Inc. build 5490)] + >>> dump_json('http://localhost:8001/3.0/system') + http_etag: "..." + mailman_version: GNU Mailman 3.0... (...) + python_version: ... resource_type_link: https://localhost:8001/3.0/#system - self_link: https://localhost:8001/3.0/sys + self_link: https://localhost:8001/3.0/system Cleanup diff --git a/src/mailman/rest/testing/server.py b/src/mailman/rest/testing/server.py index d4b9df256..d1799d0c2 100644 --- a/src/mailman/rest/testing/server.py +++ b/src/mailman/rest/testing/server.py @@ -54,7 +54,7 @@ class TestableServer: self.event.set() # Fire off one more request so the handle_request() will exit. XXX # Should we set a .timeout on the server instead? - fp = urlopen('http://localhost:8001/3.0/sys') + fp = urlopen('http://localhost:8001/3.0/system') fp.close() self.thread.join() diff --git a/src/mailman/rest/urls.py b/src/mailman/rest/urls.py index 8d82fe2c6..a0f1b396a 100644 --- a/src/mailman/rest/urls.py +++ b/src/mailman/rest/urls.py @@ -72,6 +72,6 @@ class AbsoluteURLMapper: if isinstance(ob, AdminWebServiceApplication): return '' urls = { - system: 'sys', + system: 'system', } return urls[ob] diff --git a/src/mailman/rest/webservice.py b/src/mailman/rest/webservice.py index fc8bdfcf4..bf1012203 100644 --- a/src/mailman/rest/webservice.py +++ b/src/mailman/rest/webservice.py @@ -83,7 +83,7 @@ class AdminWebServiceApplication: def get(self, name): """Maps root names to resources.""" top_level = dict( - sys=system, + system=system, ) return top_level.get(name) |