diff options
| author | Jason Robinson <jasonr@matrix.org> | 2021-01-23 21:41:35 +0200 |
|---|---|---|
| committer | Jason Robinson <jasonr@matrix.org> | 2021-01-23 21:41:35 +0200 |
| commit | 8965b6cfec8a1de847efe3d1be4b9babf4622e2e (patch) | |
| tree | 4551f104ee2ce840689aa5ecffa939938482ffd5 /tests/http/test_endpoint.py | |
| parent | Add depth and received_ts to forward_extremities admin API response (diff) | |
| parent | Return a 404 if no valid thumbnail is found. (#9163) (diff) | |
| download | synapse-8965b6cfec8a1de847efe3d1be4b9babf4622e2e.tar.xz | |
Merge branch 'develop' into jaywink/admin-forward-extremities
Diffstat (limited to 'tests/http/test_endpoint.py')
| -rw-r--r-- | tests/http/test_endpoint.py | 2 |
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 |