diff options
| author | Andrej Shadura <andrewsh@debian.org> | 2021-05-11 16:41:38 +0200 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2021-05-11 16:41:38 +0200 |
| commit | 8b13141dd36d5784fe820afa06aa21a0c5735155 (patch) | |
| tree | 12ac731328b325992ab80b1c8cecf4ed79f7935b /tests/rest/media | |
| parent | 55e3da6770137d9858028903525a99764b39e8b3 (diff) | |
New upstream version 1.33.2
Diffstat (limited to 'tests/rest/media')
| -rw-r--r-- | tests/rest/media/__init__.py | 1 | ||||
| -rw-r--r-- | tests/rest/media/v1/__init__.py | 1 | ||||
| -rw-r--r-- | tests/rest/media/v1/test_base.py | 1 | ||||
| -rw-r--r-- | tests/rest/media/v1/test_media_storage.py | 4 | ||||
| -rw-r--r-- | tests/rest/media/v1/test_url_preview.py | 4 |
5 files changed, 2 insertions, 9 deletions
diff --git a/tests/rest/media/__init__.py b/tests/rest/media/__init__.py index a354d38c..b1ee10cf 100644 --- a/tests/rest/media/__init__.py +++ b/tests/rest/media/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/rest/media/v1/__init__.py b/tests/rest/media/v1/__init__.py index a354d38c..b1ee10cf 100644 --- a/tests/rest/media/v1/__init__.py +++ b/tests/rest/media/v1/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/rest/media/v1/test_base.py b/tests/rest/media/v1/test_base.py index ebd78692..f761e23f 100644 --- a/tests/rest/media/v1/test_base.py +++ b/tests/rest/media/v1/test_base.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2019 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tests/rest/media/v1/test_media_storage.py b/tests/rest/media/v1/test_media_storage.py index 9f77125f..4a213d13 100644 --- a/tests/rest/media/v1/test_media_storage.py +++ b/tests/rest/media/v1/test_media_storage.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,10 +17,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 69685024..d3ef7bb4 100644 --- a/tests/rest/media/v1/test_url_preview.py +++ b/tests/rest/media/v1/test_url_preview.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2018 New Vector Ltd # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +14,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 |