From 3cca61e006d7e69b6643721c01ab7d81a8c2f373 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Wed, 28 Jan 2015 17:16:12 +0000
Subject: [PATCH] Rename ClientID to ClientInfo since it is a pair of IDs
rather than a single identifier
---
synapse/api/auth.py | 4 ++--
synapse/types.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/synapse/api/auth.py b/synapse/api/auth.py
index f08cb76159..9c03024512 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -21,7 +21,7 @@ from synapse.api.constants import EventTypes, Membership, JoinRules
from synapse.api.errors import AuthError, StoreError, Codes, SynapseError
from synapse.util.logutils import log_function
from synapse.util.async import run_on_reactor
-from synapse.types import UserID, ClientID
+from synapse.types import UserID, ClientInfo
import logging
@@ -318,7 +318,7 @@ class Auth(object):
user_agent=user_agent
)
- defer.returnValue((user, ClientID(device_id, token_id)))
+ defer.returnValue((user, ClientInfo(device_id, token_id)))
except KeyError:
raise AuthError(403, "Missing access token.")
diff --git a/synapse/types.py b/synapse/types.py
index 46dbab5374..f6a1b0bbcf 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -121,4 +121,4 @@ class StreamToken(
return StreamToken(**d)
-ClientID = namedtuple("ClientID", ("device_id", "token_id"))
+ClientInfo = namedtuple("ClientInfo", ("device_id", "token_id"))
--
GitLab