From 7d709542ca3ae3c69a46f3d9dc383cf9c4dfab95 Mon Sep 17 00:00:00 2001 From: Mark Haines Date: Thu, 30 Oct 2014 11:10:17 +0000 Subject: Fix pep8 warnings --- synapse/api/__init__.py | 1 - synapse/api/constants.py | 2 +- synapse/api/errors.py | 4 +++- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'synapse/api') diff --git a/synapse/api/__init__.py b/synapse/api/__init__.py index 9bff9ec169..f9811bfa04 100644 --- a/synapse/api/__init__.py +++ b/synapse/api/__init__.py @@ -12,4 +12,3 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - diff --git a/synapse/api/constants.py b/synapse/api/constants.py index 618d3d7577..3cafff0e32 100644 --- a/synapse/api/constants.py +++ b/synapse/api/constants.py @@ -58,4 +58,4 @@ class LoginType(object): EMAIL_CODE = u"m.login.email.code" EMAIL_URL = u"m.login.email.url" EMAIL_IDENTITY = u"m.login.email.identity" - RECAPTCHA = u"m.login.recaptcha" \ No newline at end of file + RECAPTCHA = u"m.login.recaptcha" 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. """ -- cgit 1.4.1