summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-01-29 01:48:36 +0000
committerMark Haines <mark.haines@matrix.org>2015-01-29 01:48:48 +0000
commitb0b80074e04dcb2b70dff56b0368060a19c065d3 (patch)
tree83198c9a0f18e90f8cc0452984ac6516dd1fc838 /synapse/storage
parentAllow the push rule delete method to take more specifiers. (diff)
downloadsynapse-b0b80074e04dcb2b70dff56b0368060a19c065d3.tar.xz
SYN-252: Supply the stream and topological parts in the correct order to the constructor
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/stream.py6
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,))