diff options
| author | Neil Johnson <neil@matrix.org> | 2019-02-04 18:05:55 +0000 |
|---|---|---|
| committer | Neil Johnson <neil@matrix.org> | 2019-02-04 18:05:55 +0000 |
| commit | 1847435e808ba04931d9ef33a980da39e51ec36e (patch) | |
| tree | 51cd51d1582b88106af1cd36f791bec6566f0588 | |
| parent | Merge pull request #4547 from matrix-org/anoa/acme_docs (diff) | |
| download | synapse-neilj/fix_trailing_slashes.tar.xz | |
remove trailing slashes as per #3622 github/neilj/fix_trailing_slashes neilj/fix_trailing_slashes
| -rw-r--r-- | synapse/federation/transport/client.py | 2 | ||||
| -rw-r--r-- | synapse/federation/transport/server.py | 8 | ||||
| -rw-r--r-- | synapse/rest/client/v2_alpha/groups.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py index 8e2be218e2..4e8919d657 100644 --- a/synapse/federation/transport/client.py +++ b/synapse/federation/transport/client.py @@ -167,7 +167,7 @@ class TransportLayerClient(object): # generated by the json_data_callback. json_data = transaction.get_dict() - path = _create_v1_path("/send/%s/", transaction.transaction_id) + path = _create_v1_path("/send/%s", transaction.transaction_id) response = yield self.client.put_json( transaction.destination, diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py index 67ae0212c3..131c67b933 100644 --- a/synapse/federation/transport/server.py +++ b/synapse/federation/transport/server.py @@ -366,7 +366,7 @@ class FederationSendServlet(BaseFederationServlet): class FederationEventServlet(BaseFederationServlet): - PATH = "/event/(?P<event_id>[^/]*)/" + PATH = "/event/(?P<event_id>[^/]*)" # This is when someone asks for a data item for a given server data_id pair. def on_GET(self, origin, content, query, event_id): @@ -374,7 +374,7 @@ class FederationEventServlet(BaseFederationServlet): class FederationStateServlet(BaseFederationServlet): - PATH = "/state/(?P<context>[^/]*)/" + PATH = "/state/(?P<context>[^/]*)" # This is when someone asks for all data for a given context. def on_GET(self, origin, content, query, context): @@ -386,7 +386,7 @@ class FederationStateServlet(BaseFederationServlet): class FederationStateIdsServlet(BaseFederationServlet): - PATH = "/state_ids/(?P<room_id>[^/]*)/" + PATH = "/state_ids/(?P<room_id>[^/]*)" def on_GET(self, origin, content, query, room_id): return self.handler.on_state_ids_request( @@ -397,7 +397,7 @@ class FederationStateIdsServlet(BaseFederationServlet): class FederationBackfillServlet(BaseFederationServlet): - PATH = "/backfill/(?P<context>[^/]*)/" + PATH = "/backfill/(?P<context>[^/]*)" def on_GET(self, origin, content, query, context): versions = [x.decode('ascii') for x in query[b"v"]] diff --git a/synapse/rest/client/v2_alpha/groups.py b/synapse/rest/client/v2_alpha/groups.py index 21e02c07c0..251e09fab1 100644 --- a/synapse/rest/client/v2_alpha/groups.py +++ b/synapse/rest/client/v2_alpha/groups.py @@ -190,7 +190,7 @@ class GroupCategoriesServlet(RestServlet): """Get all group categories """ PATTERNS = client_v2_patterns( - "/groups/(?P<group_id>[^/]*)/categories/$" + "/groups/(?P<group_id>[^/]*)/categories$" ) def __init__(self, hs): |