From 23da4a40510bfda5c617946cf6f2b7ab3f95b480 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 16 Dec 2014 15:59:40 +0000
Subject: Fix typo where we thought a list was a dict

---
 synapse/state.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'synapse/state.py')

diff --git a/synapse/state.py b/synapse/state.py
index 38adde4dc9..99f873b6e5 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -263,9 +263,10 @@ class StateHandler(object):
         }
 
         if event_type:
-            prev_states = conflicted_state.get(
-                (event_type, state_key), {}
-            ).keys()
+            prev_states_events = conflicted_state.get(
+                (event_type, state_key), []
+            )
+            prev_states = [s.event_id for s in prev_states_events]
         else:
             prev_states = []
 
-- 
cgit 1.4.1