Rename synapse module to internal due to conflicts

matrix-org · Sep 3, 2020 · 76e9000 · 76e9000
1 parent cb7c903
commit 76e9000
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 3 deletions.
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py
@@ -211,7 +211,7 @@ def _configure_named_resource(self, name, compress=False):
                 resources["/_matrix/saml2"] = SAML2Resource(self)
 
             if self.get_config().threepid_behaviour_email == ThreepidBehaviour.LOCAL:
-                from synapse.rest.synapse.client import PasswordResetRestResource
+                from synapse.rest.internal.client import PasswordResetRestResource
 
                 password_reset = PasswordResetRestResource(self)
                 resources["/_synapse/client/password_reset"] = password_reset

diff --git a/synapse/rest/synapse/__init__.py → synapse/rest/internal/__init__.py b/synapse/rest/synapse/__init__.py → synapse/rest/internal/__init__.py
diff --git a/synapse/rest/synapse/client/__init__.py → synapse/rest/internal/client/__init__.py b/synapse/rest/synapse/client/__init__.py → synapse/rest/internal/client/__init__.py
@@ -16,7 +16,7 @@
 from typing import TYPE_CHECKING
 
 from synapse.http.server import JsonResource
-from synapse.rest.synapse.client import password_reset
+from synapse.rest.internal.client import password_reset
 
 if TYPE_CHECKING:
     from synapse.server import HomeServer

diff --git a/synapse/rest/synapse/client/_base.py → synapse/rest/internal/client/_base.py b/synapse/rest/synapse/client/_base.py → synapse/rest/internal/client/_base.py
diff --git a/...pse/rest/synapse/client/password_reset.py → ...se/rest/internal/client/password_reset.py b/...pse/rest/synapse/client/password_reset.py → ...se/rest/internal/client/password_reset.py
diff --git a/tests/rest/client/v2_alpha/test_account.py b/tests/rest/client/v2_alpha/test_account.py
@@ -27,7 +27,7 @@
 from synapse.api.errors import Codes
 from synapse.rest.client.v1 import login, room
 from synapse.rest.client.v2_alpha import account, register
-from synapse.rest.synapse.client import password_reset
+from synapse.rest.internal.client import password_reset
 
 from tests import unittest