summary refs log tree commit diff
path: root/synapse/rest/transactions.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-10-30 11:10:17 +0000
committerMark Haines <mark.haines@matrix.org>2014-10-30 11:10:17 +0000
commit7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95 (patch)
tree155997683ee2d493e53218a725eb2b85b526fbe9 /synapse/rest/transactions.py
parentSYWEB-112: Use the right user ID when determining invites for display on the ... (diff)
downloadsynapse-7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95.tar.xz
Fix pep8 warnings
Diffstat (limited to 'synapse/rest/transactions.py')
-rw-r--r--synapse/rest/transactions.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/synapse/rest/transactions.py b/synapse/rest/transactions.py

index e06dcc8c57..93c0122f30 100644 --- a/synapse/rest/transactions.py +++ b/synapse/rest/transactions.py
@@ -30,9 +30,9 @@ class HttpTransactionStore(object): """Retrieve a response for this request. Args: - key (str): A transaction-independent key for this request. Typically - this is a combination of the path (without the transaction id) and - the user's access token. + key (str): A transaction-independent key for this request. Usually + this is a combination of the path (without the transaction id) + and the user's access token. txn_id (str): The transaction ID for this request Returns: A tuple of (HTTP response code, response content) or None. @@ -51,9 +51,9 @@ class HttpTransactionStore(object): """Stores an HTTP response tuple. Args: - key (str): A transaction-independent key for this request. Typically - this is a combination of the path (without the transaction id) and - the user's access token. + key (str): A transaction-independent key for this request. Usually + this is a combination of the path (without the transaction id) + and the user's access token. txn_id (str): The transaction ID for this request. response (tuple): A tuple of (HTTP response code, response content) """ @@ -92,5 +92,3 @@ class HttpTransactionStore(object): token = request.args["access_token"][0] path_without_txn_id = request.path.rsplit("/", 1)[0] return path_without_txn_id + "/" + token - -