summary refs log tree commit diff
path: root/synapse/api/errors.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-31 17:48:05 +0000
committerErik Johnston <erik@matrix.org>2014-10-31 17:48:05 +0000
commitb63691f6e205b4e2d2a990ff04318e4daf731e2c (patch)
treeaa7a80d740c7ba8f7f5ce9fe28dc32c523746d53 /synapse/api/errors.py
parentCoturn's timestamps are in seconds, not milliseconds (diff)
parentBump version numbers and change log (diff)
downloadsynapse-b63691f6e205b4e2d2a990ff04318e4daf731e2c.tar.xz
Merge branch 'release-v0.4.2' of github.com:matrix-org/synapse v0.4.2
Diffstat (limited to 'synapse/api/errors.py')
-rw-r--r--synapse/api/errors.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index 6d7d499fea..38ccb4f9d1 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -54,7 +54,7 @@ class SynapseError(CodeMessageException):
         """Constructs a synapse error.
 
         Args:
-            code (int): The integer error code (typically an HTTP response code)
+            code (int): The integer error code (an HTTP response code)
             msg (str): The human-readable error message.
             err (str): The error code e.g 'M_FORBIDDEN'
         """
@@ -67,6 +67,7 @@ class SynapseError(CodeMessageException):
             self.errcode,
         )
 
+
 class RoomError(SynapseError):
     """An error raised when a room event fails."""
     pass
@@ -117,6 +118,7 @@ class InvalidCaptchaError(SynapseError):
             error_url=self.error_url,
         )
 
+
 class LimitExceededError(SynapseError):
     """A client has sent too many requests and is being throttled.
     """