diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-12-29 23:12:30 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-29 23:12:30 +1100 |
| commit | d7843f47b6a4568bd17b18e33fe31e7dcd4c7ebd (patch) | |
| tree | a302262fd86fac16451d702f1678649749de8af4 /synapse/rest/__init__.py | |
| parent | Remove mention of lt-cred-mech in the sample coturn config. (#4333) (diff) | |
| download | synapse-d7843f47b6a4568bd17b18e33fe31e7dcd4c7ebd.tar.xz | |
Remove v1 only REST APIs now we don't ship matrix console (#4334)
Diffstat (limited to 'synapse/rest/__init__.py')
| -rw-r--r-- | synapse/rest/__init__.py | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py index 5f35c2d1be..66585c991f 100644 --- a/synapse/rest/__init__.py +++ b/synapse/rest/__init__.py @@ -14,8 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from six import PY3 - from synapse.http.server import JsonResource from synapse.rest.client import versions from synapse.rest.client.v1 import ( @@ -56,11 +54,6 @@ from synapse.rest.client.v2_alpha import ( user_directory, ) -if not PY3: - from synapse.rest.client.v1_only import ( - register as v1_register, - ) - class ClientRestResource(JsonResource): """A resource for version 1 of the matrix client API.""" @@ -73,10 +66,6 @@ class ClientRestResource(JsonResource): def register_servlets(client_resource, hs): versions.register_servlets(client_resource) - if not PY3: - # "v1" (Python 2 only) - v1_register.register_servlets(hs, client_resource) - # Deprecated in r0 initial_sync.register_servlets(hs, client_resource) room.register_deprecated_servlets(hs, client_resource) |