OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3153 from NotAFile/py3-httplib 

move httplib import to six
pull/3149/merge
Richard van der Hoff 2018-04-30 01:26:42 +01:00 committed by GitHub
parent 683149c1f9 94f4d7f49e
commit bc2017a594
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/handlers/federation.py
View File

@ -16,7 +16,6 @@
"""Contains handlers for federation events.""" """Contains handlers for federation events."""
import httplib
import itertools import itertools
import logging import logging
import sys import sys
@ -24,6 +23,7 @@ import sys
from signedjson.key import decode_verify_key_bytes from signedjson.key import decode_verify_key_bytes
from signedjson.sign import verify_signed_json from signedjson.sign import verify_signed_json
import six import six
from six.moves import http_client
from twisted.internet import defer from twisted.internet import defer
from unpaddedbase64 import decode_base64 from unpaddedbase64 import decode_base64
@ -890,7 +890,7 @@ class FederationHandler(BaseHandler):
logger.warn("Rejecting event %s which has %i prev_events", logger.warn("Rejecting event %s which has %i prev_events",
ev.event_id, len(ev.prev_events)) ev.event_id, len(ev.prev_events))
raise SynapseError( raise SynapseError(
httplib.BAD_REQUEST, http_client.BAD_REQUEST,
"Too many prev_events", "Too many prev_events",
) )
@ -898,7 +898,7 @@ class FederationHandler(BaseHandler):
logger.warn("Rejecting event %s which has %i auth_events", logger.warn("Rejecting event %s which has %i auth_events",
ev.event_id, len(ev.auth_events)) ev.event_id, len(ev.auth_events))
raise SynapseError( raise SynapseError(
httplib.BAD_REQUEST, http_client.BAD_REQUEST,
"Too many auth_events", "Too many auth_events",
) )