Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.6.0

Conflicts:
	synapse/state.py

1 files changed, 11 insertions, 11 deletions

diff --git a/synapse/events/__init__.py b/synapse/events/__init__.py

index 984f14fce4..34b1b944ab 100644
--- a/synapse/events/__init__.py
+++ b/synapse/events/__init__.py
@@ -30,20 +30,20 @@ class _EventInternalMetadata(object):
 
 
 def _event_dict_property(key):
-        def getter(self):
-            return self._event_dict[key]
+    def getter(self):
+        return self._event_dict[key]
 
-        def setter(self, v):
-            self._event_dict[key] = v
+    def setter(self, v):
+        self._event_dict[key] = v
 
-        def delete(self):
-            del self._event_dict[key]
+    def delete(self):
+        del self._event_dict[key]
 
-        return property(
-            getter,
-            setter,
-            delete,
-        )
+    return property(
+        getter,
+        setter,
+        delete,
+    )
 
 
 class EventBase(object):