summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-01-22 15:57:26 +0000
committerErik Johnston <erik@matrix.org>2015-01-22 15:57:26 +0000
commitc2f976874060c7b6e6410effea94df3174f9eacd (patch)
treee469e8230f1b8a2f2787f39e0584b1659cbb7431
parentAdd support for storing rejected events in EventContext and data stores (diff)
parentfix pyflakes (diff)
downloadsynapse-c2f976874060c7b6e6410effea94df3174f9eacd.tar.xz
Merge branch 'new_state_resolution' of github.com:matrix-org/synapse into rejections
-rw-r--r--synapse/state.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/state.py b/synapse/state.py
index 5b622ad3b1..d9fdfb34be 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.