summary refs log tree commit diff
diff options
context:
space:
mode:
authorWill Hunt <will@half-shot.uk>2019-07-11 15:36:57 +0100
committerWill Hunt <will@half-shot.uk>2019-07-11 15:36:57 +0100
commitf62000f30839965533ac1ef29fc5e59e0c65bae6 (patch)
tree398629d5fe15919765b9c580439171886761533f
parentFix newsfile (diff)
downloadsynapse-f62000f30839965533ac1ef29fc5e59e0c65bae6.tar.xz
Linting
-rw-r--r--synapse/rest/client/v1/presence.py1
-rw-r--r--synapse/rest/client/v2_alpha/capabilities.py2
-rw-r--r--tests/rest/client/v1/test_presence.py22
-rw-r--r--tests/rest/client/v2_alpha/test_capabilities.py20
4 files changed, 19 insertions, 26 deletions
diff --git a/synapse/rest/client/v1/presence.py b/synapse/rest/client/v1/presence.py
index cb4c47451e..576e9e0d14 100644
--- a/synapse/rest/client/v1/presence.py
+++ b/synapse/rest/client/v1/presence.py
@@ -48,7 +48,6 @@ class PresenceStatusRestServlet(RestServlet):
         if not self.hs.config.use_presence:
             raise AuthError(403, "Presence is disabled on this homeserver")
 
-
         if requester.user != user:
             allowed = yield self.presence_handler.is_visible(
                 observed_user=user, observer_user=requester.user
diff --git a/synapse/rest/client/v2_alpha/capabilities.py b/synapse/rest/client/v2_alpha/capabilities.py
index e594bfb9bf..979e0e37b8 100644
--- a/synapse/rest/client/v2_alpha/capabilities.py
+++ b/synapse/rest/client/v2_alpha/capabilities.py
@@ -58,7 +58,7 @@ class CapabilitiesRestServlet(RestServlet):
                 "m.change_password": {"enabled": change_password},
                 "m.presence": {
                     "send_enabled": self.config.use_presence,
-                    "receive_enabled": self.config.use_presence
+                    "receive_enabled": self.config.use_presence,
                 },
             }
         }
diff --git a/tests/rest/client/v1/test_presence.py b/tests/rest/client/v1/test_presence.py
index 5853ad0ca0..73eb0c2be4 100644
--- a/tests/rest/client/v1/test_presence.py
+++ b/tests/rest/client/v1/test_presence.py
@@ -69,10 +69,13 @@ class PresenceTestCase(unittest.HomeserverTestCase):
         self.render(request)
 
         self.assertEqual(channel.code, 403)
-        self.assertEqual({
-            "errcode": "M_FORBIDDEN",
-            "error": "Presence is disabled on this homeserver"
-        }, channel.json_body)
+        self.assertEqual(
+            {
+                "errcode": "M_FORBIDDEN",
+                "error": "Presence is disabled on this homeserver"
+            },
+            channel.json_body,
+        )
         self.assertEqual(self.hs.presence_handler.set_state.call_count, 0)
 
     def test_get_presence_disabled(self):
@@ -88,7 +91,10 @@ class PresenceTestCase(unittest.HomeserverTestCase):
         self.render(request)
 
         self.assertEqual(channel.code, 403)
-        self.assertEqual({
-            "errcode": "M_FORBIDDEN",
-            "error": "Presence is disabled on this homeserver"
-        }, channel.json_body)
+        self.assertEqual(
+            {
+                "errcode": "M_FORBIDDEN",
+                "error": "Presence is disabled on this homeserver"
+            },
+            channel.json_body,
+        )
diff --git a/tests/rest/client/v2_alpha/test_capabilities.py b/tests/rest/client/v2_alpha/test_capabilities.py
index 496b3b85fe..c19f6083dc 100644
--- a/tests/rest/client/v2_alpha/test_capabilities.py
+++ b/tests/rest/client/v2_alpha/test_capabilities.py
@@ -90,14 +90,8 @@ class CapabilitiesTestCase(unittest.HomeserverTestCase):
         capabilities = channel.json_body["capabilities"]
         self.assertEqual(channel.code, 200)
 
-        self.assertEqual(
-            True,
-            capabilities["m.presence"]["send_enabled"],
-        )
-        self.assertEqual(
-            True,
-            capabilities["m.presence"]["receive_enabled"],
-        )
+        self.assertEqual(True, capabilities["m.presence"]["send_enabled"])
+        self.assertEqual(True, capabilities["m.presence"]["receive_enabled"])
 
         self.hs.get_config().use_presence = False
         request, channel = self.make_request("GET", self.url, access_token=access_token)
@@ -105,11 +99,5 @@ class CapabilitiesTestCase(unittest.HomeserverTestCase):
         capabilities = channel.json_body["capabilities"]
         self.assertEqual(channel.code, 200)
 
-        self.assertEqual(
-            False,
-            capabilities["m.presence"]["send_enabled"],
-        )
-        self.assertEqual(
-            False,
-            capabilities["m.presence"]["receive_enabled"],
-        )
+        self.assertEqual(False, capabilities["m.presence"]["send_enabled"])
+        self.assertEqual(False, capabilities["m.presence"]["receive_enabled"])
\ No newline at end of file