diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-04-09 13:44:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-09 13:44:38 -0400 |
| commit | 0b3112123da5fae4964db784e3bab0c4d83d9d62 (patch) | |
| tree | 8d2766cf654b7fd2b446d15d4bbb8013cce0fd1a /tests/rest/media | |
| parent | Fix duplicate logging of exceptions in transaction processing (#9780) (diff) | |
| download | synapse-0b3112123da5fae4964db784e3bab0c4d83d9d62.tar.xz | |
Use mock from the stdlib. (#9772)
Diffstat (limited to 'tests/rest/media')
| -rw-r--r-- | tests/rest/media/v1/test_media_storage.py | 3 | ||||
| -rw-r--r-- | tests/rest/media/v1/test_url_preview.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py index 9f77125fd4..375f0b7977 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py @@ -18,10 +18,9 @@ import tempfile from binascii import unhexlify from io import BytesIO from typing import Optional +from unittest.mock import Mock from urllib import parse -from mock import Mock - import attr from parameterized import parameterized_class from PIL import Image as Image diff --git a/tests/rest/media/v1/test_url_preview.py b/tests/rest/media/v1/test_url_preview.py index 6968502433..9067463e54 100644 --- a/tests/rest/media/v1/test_url_preview.py +++ b/tests/rest/media/v1/test_url_preview.py @@ -15,8 +15,7 @@ import json import os import re - -from mock import patch +from unittest.mock import patch from twisted.internet._resolver import HostResolution from twisted.internet.address import IPv4Address, IPv6Address |