diff options
| author | Will Hunt <will@half-shot.uk> | 2020-07-05 16:32:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-05 16:32:02 +0100 |
| commit | 62b1ce85398f52e7d6137e77083294d0c90af459 (patch) | |
| tree | 8bb59226c2abea66fccfd42068a608a88eeaae8c /tests/rest/media | |
| parent | Merge different Resource implementation classes (#7732) (diff) | |
| download | synapse-62b1ce85398f52e7d6137e77083294d0c90af459.tar.xz | |
isort 5 compatibility (#7786)
The CI appears to use the latest version of isort, which is a problem when isort gets a major version bump. Rather than try to pin the version, I've done the necessary to make isort5 happy with synapse.
Diffstat (limited to 'tests/rest/media')
| -rw-r--r-- | tests/rest/media/v1/test_media_storage.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py index 2ed9312d56..66fa5978b2 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py @@ -12,8 +12,6 @@ # 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. - - import os import shutil import tempfile @@ -25,8 +23,8 @@ from urllib import parse from mock import Mock import attr -import PIL.Image as Image from parameterized import parameterized_class +from PIL import Image as Image from twisted.internet.defer import Deferred |