From 73dd81ca62885110f7fe0e51e7f4e0183b495d17 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 22 Jan 2015 15:57:08 +0000
Subject: [PATCH 1/3] fix pyflakes

---
 synapse/state.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/synapse/state.py b/synapse/state.py
index 5b622ad3b..d9fdfb34b 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -295,7 +295,7 @@ class StateHandler(object):
                 # get around circular deps.
                 self.hs.get_auth().check(event, auth_events)
                 return event
-            except AuthError as e:
+            except AuthError:
                 pass
 
         # Oh dear.

From 76d7fd39cd44393a5c712930e77c64e202df17cc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Jan 2015 13:52:02 +0000
Subject: [PATCH 2/3] Style changes.

---
 synapse/state.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/synapse/state.py b/synapse/state.py
index d9fdfb34b..43bda3525 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -37,6 +37,9 @@ def _get_state_key_from_event(event):
 KeyStateTuple = namedtuple("KeyStateTuple", ("context", "type", "state_key"))
 
 
+AuthEventTypes = (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
+
+
 class StateHandler(object):
     """ Responsible for doing state conflict resolution.
     """
@@ -215,7 +218,7 @@ class StateHandler(object):
 
         auth_events = {
             k: e for k, e in unconflicted_state.items()
-            if k[0] in (EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,)
+            if k[0] in AuthEventTypes
         }
 
         try:
@@ -240,10 +243,6 @@ class StateHandler(object):
             1. power levels
             2. memberships
             3. other events.
-
-        :param conflicted_state:
-        :param auth_events:
-        :return:
         """
         resolved_state = {}
         power_key = (EventTypes.PowerLevels, "")
@@ -305,4 +304,4 @@ class StateHandler(object):
         def key_func(e):
             return -int(e.depth), hashlib.sha1(e.event_id).hexdigest()
 
-        return sorted(events, key=key_func)
\ No newline at end of file
+        return sorted(events, key=key_func)

From 7a9f6f083e0998893eb9d837512009509d81c998 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 30 Jan 2015 13:55:46 +0000
Subject: [PATCH 3/3] Remove commented line

---
 synapse/state.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/synapse/state.py b/synapse/state.py
index 43bda3525..dff11711a 100644
--- a/synapse/state.py
+++ b/synapse/state.py
@@ -46,7 +46,6 @@ class StateHandler(object):
 
     def __init__(self, hs):
         self.store = hs.get_datastore()
-        # self.auth = hs.get_auth()
         self.hs = hs
 
     @defer.inlineCallbacks