diff --git a/synapse/federation/transport/client.py b/synapse/federation/transport/client.py
index 8e2be218e2..68808e9203 100644
--- a/synapse/federation/transport/client.py
+++ b/synapse/federation/transport/client.py
@@ -51,8 +51,8 @@ class TransportLayerClient(object):
logger.debug("get_room_state dest=%s, room=%s",
destination, room_id)
- path = _create_v1_path("/state/%s/", room_id)
- return self.client.get_json(
+ path = _create_v1_path("/state/%s", room_id)
+ return self.client.get_json_with_trailing_slashes_on_404(
destination, path=path, args={"event_id": event_id},
)
@@ -73,8 +73,8 @@ class TransportLayerClient(object):
logger.debug("get_room_state_ids dest=%s, room=%s",
destination, room_id)
- path = _create_v1_path("/state_ids/%s/", room_id)
- return self.client.get_json(
+ path = _create_v1_path("/state_ids/%s", room_id)
+ return self.client.get_json_with_trailing_slashes_on_404(
destination, path=path, args={"event_id": event_id},
)
@@ -95,8 +95,10 @@ class TransportLayerClient(object):
logger.debug("get_pdu dest=%s, event_id=%s",
destination, event_id)
- path = _create_v1_path("/event/%s/", event_id)
- return self.client.get_json(destination, path=path, timeout=timeout)
+ path = _create_v1_path("/event/%s", event_id)
+ return self.client.get_json_with_trailing_slashes_on_404(
+ destination, path=path, timeout=timeout,
+ )
@log_function
def backfill(self, destination, room_id, event_tuples, limit):
@@ -121,14 +123,14 @@ class TransportLayerClient(object):
# TODO: raise?
return
- path = _create_v1_path("/backfill/%s/", room_id)
+ path = _create_v1_path("/backfill/%s", room_id)
args = {
"v": event_tuples,
"limit": [str(limit)],
}
- return self.client.get_json(
+ return self.client.get_json_with_trailing_slashes_on_404(
destination,
path=path,
args=args,
@@ -167,9 +169,9 @@ 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(
+ response = yield self.client.put_json_with_trailing_slashes_on_404(
transaction.destination,
path=path,
data=json_data,
@@ -959,7 +961,7 @@ def _create_v1_path(path, *args):
Example:
- _create_v1_path("/event/%s/", event_id)
+ _create_v1_path("/event/%s", event_id)
Args:
path (str): String template for the path
@@ -980,7 +982,7 @@ def _create_v2_path(path, *args):
Example:
- _create_v2_path("/event/%s/", event_id)
+ _create_v2_path("/event/%s", event_id)
Args:
path (str): String template for the path
|
