diff options
| author | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-01-30 11:10:37 +0000 |
| commit | 2ebf795c0ada8b30f22f9aca54753471a04649f6 (patch) | |
| tree | 23710ca7b15e7d65eee8885a04b23a829ca00379 /synapse/storage/stream.py | |
| parent | Update the current state of an event if we update auth events. (diff) | |
| parent | Include content in notification pokes (diff) | |
| download | synapse-2ebf795c0ada8b30f22f9aca54753471a04649f6.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
Diffstat (limited to 'synapse/storage/stream.py')
| -rw-r--r-- | synapse/storage/stream.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 8ac2adab05..062ca06fb3 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -82,10 +82,10 @@ class _StreamToken(namedtuple("_StreamToken", "topological stream")): def parse(cls, string): try: if string[0] == 's': - return cls(None, int(string[1:])) + return cls(topological=None, stream=int(string[1:])) if string[0] == 't': parts = string[1:].split('-', 1) - return cls(int(parts[1]), int(parts[0])) + return cls(topological=int(parts[0]), stream=int(parts[1])) except: pass raise SynapseError(400, "Invalid token %r" % (string,)) @@ -94,7 +94,7 @@ class _StreamToken(namedtuple("_StreamToken", "topological stream")): def parse_stream_token(cls, string): try: if string[0] == 's': - return cls(None, int(string[1:])) + return cls(topological=None, stream=int(string[1:])) except: pass raise SynapseError(400, "Invalid token %r" % (string,)) |