Merge branch 'develop' into storage_transactions

This commit is contained in:
Mark Haines 2014-08-27 16:54:12 +01:00
commit 1d95e78759
34 changed files with 1414 additions and 865 deletions

View file

@ -124,6 +124,11 @@ class BaseHomeServer(object):
object."""
return UserID.from_string(s, hs=self)
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, hs=self)
def parse_roomalias(self, s):
"""Parse the string given by 's' as a Room Alias and return a RoomAlias
object."""