summary refs log tree commit diff
path: root/tests/http/test_endpoint.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-22 18:26:10 +0100
commit15f31e1ca9c90bed34b2de084c669b81e48e7f22 (patch)
treeb34df1a72437244309c1b50204ca02a974f230ae /tests/http/test_endpoint.py
parentMerge commit 'fa50e4bf4' into anoa/dinsic_release_1_31_0 (diff)
parentSupport icons for Identity Providers (#9154) (diff)
downloadsynapse-15f31e1ca9c90bed34b2de084c669b81e48e7f22.tar.xz
Merge commit '0cd2938bc' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests/http/test_endpoint.py')
-rw-r--r--tests/http/test_endpoint.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/http/test_endpoint.py b/tests/http/test_endpoint.py

index b2e9533b07..d06ea518ce 100644 --- a/tests/http/test_endpoint.py +++ b/tests/http/test_endpoint.py
@@ -12,7 +12,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from synapse.http.endpoint import parse_and_validate_server_name, parse_server_name +from synapse.util.stringutils import parse_and_validate_server_name, parse_server_name from tests import unittest