summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAdrian Tschira <nota@notafile.com>2018-04-28 11:46:48 +0200
committerAdrian Tschira <nota@notafile.com>2018-04-28 13:43:34 +0200
commit94f4d7f49ed322dac38e8946bba590ac41c0f40f (patch)
tree874c373038b69d8532b1af7394c1f93a748e4fcf /synapse
parentMerge pull request #3127 from matrix-org/rav/deferred_timeout (diff)
downloadsynapse-94f4d7f49ed322dac38e8946bba590ac41c0f40f.tar.xz
move httplib import to six
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/federation.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 260df025f9..24ff6782c5 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -16,7 +16,6 @@
 
 """Contains handlers for federation events."""
 
-import httplib
 import itertools
 import logging
 import sys
@@ -24,6 +23,7 @@ import sys
 from signedjson.key import decode_verify_key_bytes
 from signedjson.sign import verify_signed_json
 import six
+from six.moves import http_client
 from twisted.internet import defer
 from unpaddedbase64 import decode_base64
 
@@ -889,7 +889,7 @@ class FederationHandler(BaseHandler):
             logger.warn("Rejecting event %s which has %i prev_events",
                         ev.event_id, len(ev.prev_events))
             raise SynapseError(
-                httplib.BAD_REQUEST,
+                http_client.BAD_REQUEST,
                 "Too many prev_events",
             )
 
@@ -897,7 +897,7 @@ class FederationHandler(BaseHandler):
             logger.warn("Rejecting event %s which has %i auth_events",
                         ev.event_id, len(ev.auth_events))
             raise SynapseError(
-                httplib.BAD_REQUEST,
+                http_client.BAD_REQUEST,
                 "Too many auth_events",
             )