summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-23 11:55:12 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-23 11:55:12 +0000
commit1c06c48ce2db3c6355e29de1533aebf36bc3775b (patch)
treea114a45bcf1a1f9184344381548fd58008013ece /synapse/server.py
parentReplace hs.parse_userid with UserID.from_string (diff)
downloadsynapse-1c06c48ce2db3c6355e29de1533aebf36bc3775b.tar.xz
Replace hs.parse_roomid with RoomID.from_string
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/synapse/server.py b/synapse/server.py
index 52a21aaf78..4dfff04277 100644
--- a/synapse/server.py
+++ b/synapse/server.py
@@ -26,7 +26,7 @@ from synapse.api.auth import Auth
 from synapse.handlers import Handlers
 from synapse.state import StateHandler
 from synapse.storage import DataStore
-from synapse.types import UserID, RoomAlias, RoomID, EventID
+from synapse.types import RoomAlias, EventID
 from synapse.util import Clock
 from synapse.util.distributor import Distributor
 from synapse.util.lockutils import LockManager
@@ -132,11 +132,6 @@ class BaseHomeServer(object):
         object."""
         return RoomAlias.from_string(s)
 
-    def parse_roomid(self, s):
-        """Parse the string given by 's' as a Room ID and return a RoomID
-        object."""
-        return RoomID.from_string(s)
-
     def parse_eventid(self, s):
         """Parse the string given by 's' as a Event ID and return a EventID
         object."""