summary refs log tree commit diff
path: root/tests/events/test_utils.py
diff options
context:
space:
mode:
authorMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-07-19 16:42:52 +0100
committerMichael Kaye <1917473+michaelkaye@users.noreply.github.com>2018-07-19 16:55:19 +0100
commitcee45fb44c2a5b2e98650adac082ca51bc39dff1 (patch)
tree7e9521dd27b16b3bb9546e0caba05820f53fb352 /tests/events/test_utils.py
parentMerge pull request #3557 from matrix-org/dbkr/delete_profiles (diff)
parentMerge pull request #3377 from Valodim/note-affinity (diff)
downloadsynapse-github/michaelkaye/merge_0-33_to_dinsic.tar.xz
Merge remote-tracking branch 'origin/master' into dinsic github/michaelkaye/merge_0-33_to_dinsic michaelkaye/merge_0-33_to_dinsic
Diffstat (limited to 'tests/events/test_utils.py')
-rw-r--r--tests/events/test_utils.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/events/test_utils.py b/tests/events/test_utils.py
index dfc870066e..f51d99419e 100644
--- a/tests/events/test_utils.py
+++ b/tests/events/test_utils.py
@@ -14,11 +14,11 @@
 # limitations under the License.
 
 
-from .. import unittest
-
 from synapse.events import FrozenEvent
 from synapse.events.utils import prune_event, serialize_event
 
+from .. import unittest
+
 
 def MockEvent(**kwargs):
     if "event_id" not in kwargs: