Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Remove v1 only REST APIs now we don't ship matrix console #4334

Merged
merged 4 commits into from
Dec 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4334.removal
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove the deprecated v1/register API on Python 2. It was never ported to Python 3.
11 changes: 0 additions & 11 deletions synapse/rest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -56,11 +54,6 @@
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."""
Expand All @@ -73,10 +66,6 @@ def __init__(self, hs):
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)
Expand Down
3 changes: 0 additions & 3 deletions synapse/rest/client/v1_only/__init__.py

This file was deleted.

39 changes: 0 additions & 39 deletions synapse/rest/client/v1_only/base.py

This file was deleted.

Loading