diff --git a/synapse/types.py b/synapse/types.py
index 00655f6dd2..7b12231576 100644
--- a/synapse/types.py
+++ b/synapse/types.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
@@ -16,13 +15,11 @@
import abc
import re
import string
-import sys
from collections import namedtuple
from typing import (
TYPE_CHECKING,
Any,
Dict,
- Iterable,
Mapping,
MutableMapping,
Optional,
@@ -52,18 +49,6 @@ if TYPE_CHECKING:
from synapse.appservice.api import ApplicationService
from synapse.storage.databases.main import DataStore
-# define a version of typing.Collection that works on python 3.5
-if sys.version_info[:3] >= (3, 6, 0):
- from typing import Collection
-else:
- from typing import Container, Sized
-
- T_co = TypeVar("T_co", covariant=True)
-
- class Collection(Iterable[T_co], Container[T_co], Sized): # type: ignore
- __slots__ = ()
-
-
# Define a state map type from type/state_key to T (usually an event ID or
# event)
T = TypeVar("T")
@@ -215,9 +200,8 @@ def get_localpart_from_id(string):
DS = TypeVar("DS", bound="DomainSpecificString")
-class DomainSpecificString(
- namedtuple("DomainSpecificString", ("localpart", "domain")), metaclass=abc.ABCMeta
-):
+@attr.s(slots=True, frozen=True, repr=False)
+class DomainSpecificString(metaclass=abc.ABCMeta):
"""Common base class among ID/name strings that have a local part and a
domain name, prefixed with a sigil.
@@ -229,11 +213,8 @@ class DomainSpecificString(
SIGIL = abc.abstractproperty() # type: str # type: ignore
- # Deny iteration because it will bite you if you try to create a singleton
- # set by:
- # users = set(user)
- def __iter__(self):
- raise ValueError("Attempted to iterate a %s" % (type(self).__name__,))
+ localpart = attr.ib(type=str)
+ domain = attr.ib(type=str)
# Because this class is a namedtuple of strings and booleans, it is deeply
# immutable.
@@ -288,30 +269,35 @@ class DomainSpecificString(
__repr__ = to_string
+@attr.s(slots=True, frozen=True, repr=False)
class UserID(DomainSpecificString):
"""Structure representing a user ID."""
SIGIL = "@"
+@attr.s(slots=True, frozen=True, repr=False)
class RoomAlias(DomainSpecificString):
"""Structure representing a room name."""
SIGIL = "#"
+@attr.s(slots=True, frozen=True, repr=False)
class RoomID(DomainSpecificString):
"""Structure representing a room id. """
SIGIL = "!"
+@attr.s(slots=True, frozen=True, repr=False)
class EventID(DomainSpecificString):
"""Structure representing an event id. """
SIGIL = "$"
+@attr.s(slots=True, frozen=True, repr=False)
class GroupID(DomainSpecificString):
"""Structure representing a group ID."""
|
