diff options
| author | David Baker <dave@matrix.org> | 2017-04-25 19:30:55 +0100 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2017-04-25 19:30:55 +0100 |
| commit | 1a9255c12eb73245bdbb626a1a0cad2fbe967caa (patch) | |
| tree | 987da3f437c3d66ac053ab95fdd60d1b287127ca /synapse/server.py | |
| parent | Need the HTTP status code (diff) | |
| download | synapse-1a9255c12eb73245bdbb626a1a0cad2fbe967caa.tar.xz | |
Use CodeMessageException subclass instead
Parse json errors from get_json client methods and throw special errors.
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/synapse/server.py b/synapse/server.py index 8325d77a7a..12754c89ae 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -49,9 +49,7 @@ from synapse.handlers.events import EventHandler, EventStreamHandler from synapse.handlers.initial_sync import InitialSyncHandler from synapse.handlers.receipts import ReceiptsHandler from synapse.handlers.read_marker import ReadMarkerHandler -from synapse.http.client import ( - SimpleHttpClient, InsecureInterceptableContextFactory, MatrixProxyClient -) +from synapse.http.client import SimpleHttpClient, InsecureInterceptableContextFactory from synapse.http.matrixfederationclient import MatrixFederationHttpClient from synapse.notifier import Notifier from synapse.push.pusherpool import PusherPool @@ -130,7 +128,6 @@ class HomeServer(object): 'filtering', 'http_client_context_factory', 'simple_http_client', - 'matrix_proxy_client', 'media_repository', 'federation_transport_client', 'federation_sender', @@ -193,9 +190,6 @@ class HomeServer(object): def build_simple_http_client(self): return SimpleHttpClient(self) - def build_matrix_proxy_client(self): - return MatrixProxyClient(self) - def build_v1auth(self): orf = Auth(self) # Matrix spec makes no reference to what HTTP status code is returned, |