Remove mock library dependency (thumbor#1396)

setup.py

@@ -26,7 +26,6 @@
     "coverage==5.*,>=5.0.3",
     "flake8==3.*,>=3.7.9",
     "isort==4.*,>=4.3.21",
-    "mock==3.*,>=3.0.5",
     "numpy==1.*,>=1.18.1",
     "preggy==1.*,>=1.4.4",
     "py3exiv2==0.*,>=0.7.1,!=0.7.2,!=0.8.0,!=0.9.3",

tests/detectors/test_glasses_detector.py

@@ -9,8 +9,8 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from os.path import abspath
+from unittest import mock
 
-import mock
 from preggy import expect
 from tornado.testing import gen_test
 

tests/detectors/test_profile_detector.py

@@ -9,8 +9,8 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from os.path import abspath
+from unittest import mock
 
-import mock
 from preggy import expect
 from tornado.testing import gen_test
 

tests/detectors/test_queued_detector.py

@@ -9,8 +9,8 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from json import loads
+from unittest import mock
 
-import mock
 from preggy import expect
 from redis import Redis
 from tornado.testing import gen_test

tests/engines/test_base_engine.py

@@ -12,10 +12,9 @@
 
 from os.path import abspath, dirname, join
 from struct import pack
-from unittest import TestCase
+from unittest import TestCase, mock
 from xml.etree.ElementTree import ParseError
 
-import mock
 from preggy import expect
 
 from thumbor.config import Config

tests/handlers/test_base_handler_respecting_orientation.py

@@ -13,11 +13,11 @@
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.engines.pil import Engine
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_auto_png_to_jpg.py

@@ -8,15 +8,16 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-from mock import patch
+from unittest.mock import patch
+
 from libthumbor import CryptoURL
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import RequestParameters, ServerParameters
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_auto_webp.py

@@ -9,17 +9,17 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from shutil import which
+from unittest.mock import patch
 from urllib.parse import quote
 
+from libthumbor import CryptoURL
 from preggy import expect
 from tornado.testing import gen_test
-from mock import patch
-from libthumbor import CryptoURL
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, RequestParameters, ServerParameters
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_cover.py

@@ -13,10 +13,10 @@
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_different_storage_config.py

@@ -14,13 +14,13 @@
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.engines.pil import Engine
 from thumbor.importer import Importer
 from thumbor.storages.file_storage import Storage as FileStorage
 from thumbor.storages.no_storage import Storage as NoStorage
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_engine_error.py

@@ -8,16 +8,17 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
+from unittest.mock import patch
+
 import pytest
-from mock import patch
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.engines.pil import Engine
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_gifv.py

@@ -14,10 +14,10 @@
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.importer import Importer
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_http_headers.py

@@ -74,7 +74,7 @@ async def test_can_get_image_cors_header(self):
 
 class ImageOperationsWithCorsHeaderTestCase(BaseImagingTestCase):
     def get_context(self):
-        cfg = Config(SECURITY_KEY="ACME-SEC", ACCESS_CONTROL_ALLOW_ORIGIN_HEADER='*')
+        cfg = Config(SECURITY_KEY="ACME-SEC", ACCESS_CONTROL_ALLOW_ORIGIN_HEADER="*")
         cfg.LOADER = "thumbor.loaders.file_loader"
         cfg.FILE_LOADER_ROOT_PATH = self.loader_path
         cfg.ENABLE_ETAGS = False
@@ -93,7 +93,7 @@ async def test_can_get_image_with_cors_header(self):
 
         expect(response.code).to_equal(200)
         expect(response.headers).to_include("Access-Control-Allow-Origin")
-        expect(response.headers['Access-Control-Allow-Origin']).to_equal('*')
+        expect(response.headers["Access-Control-Allow-Origin"]).to_equal("*")
 
 
 class ImageOperationsWithLastModifiedTestCase(BaseImagingTestCase):

tests/handlers/test_base_handler_with_jpegtran.py

@@ -17,14 +17,14 @@
 from preggy import expect
 from tornado.testing import gen_test
 
-from thumbor.config import Config
-from thumbor.context import Context, ServerParameters
-from thumbor.importer import Importer
 from tests.handlers.test_base_handler import (
-    BaseImagingTestCase,
-    JPEGTRAN_AVAILABLE,
     EXIFTOOL_AVAILABLE,
+    JPEGTRAN_AVAILABLE,
+    BaseImagingTestCase,
 )
+from thumbor.config import Config
+from thumbor.context import Context, ServerParameters
+from thumbor.importer import Importer
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_loader_error.py

@@ -11,11 +11,11 @@
 from preggy import expect
 from tornado.testing import gen_test
 
+from tests.handlers.test_base_handler import BaseImagingTestCase
 from thumbor.config import Config
 from thumbor.context import Context, ServerParameters
 from thumbor.importer import Importer
 from thumbor.loaders import LoaderResult
-from tests.handlers.test_base_handler import BaseImagingTestCase
 
 # pylint: disable=broad-except,abstract-method,attribute-defined-outside-init,line-too-long,too-many-public-methods
 # pylint: disable=too-many-lines

tests/handlers/test_base_handler_with_native_gif_handling.py

@@ -10,8 +10,8 @@
 
 import os
 from os.path import dirname
+from unittest.mock import Mock
 
-from mock import Mock
 from preggy import expect
 from tornado.testing import gen_test
 

tests/handlers/test_base_handler_with_result_storage.py

@@ -11,8 +11,8 @@
 import os
 from os.path import dirname
 from shutil import which
+from unittest.mock import Mock, patch
 
-from mock import Mock, patch
 from preggy import expect
 from tornado.testing import gen_test
 

tests/handlers/test_fetch_result.py

@@ -8,7 +8,8 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-from mock import Mock
+from unittest.mock import Mock
+
 from preggy import expect
 
 from tests.base import TestCase

tests/loaders/test_file_loader_http_fallback.py

@@ -9,8 +9,8 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from os.path import abspath, dirname, join
+from unittest.mock import patch
 
-from mock import patch
 from preggy import expect
 from tornado.testing import gen_test
 

tests/metrics/test_default_metrics.py

@@ -8,13 +8,13 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-import mock
+from unittest import mock
+
 from preggy import expect
 
 import thumbor.metrics
-from thumbor.importer import Importer
-
 from tests.base import TestCase
+from thumbor.importer import Importer
 
 
 class DefaultMetricsTestCase(TestCase):

tests/metrics/test_logger_metrics.py

@@ -10,12 +10,11 @@
 
 from preggy import expect
 
-from thumbor.context import Context
-from thumbor.importer import Importer
-from thumbor.config import Config
 import thumbor.metrics
-
 from tests.base import TestCase
+from thumbor.config import Config
+from thumbor.context import Context
+from thumbor.importer import Importer
 
 
 class LoggerMetricsTestCase(TestCase):

tests/metrics/test_statsd_metrics.py

@@ -10,12 +10,11 @@
 
 from preggy import expect
 
-from thumbor.context import Context
-from thumbor.importer import Importer
-from thumbor.config import Config
 import thumbor.metrics
-
 from tests.base import TestCase
+from thumbor.config import Config
+from thumbor.context import Context
+from thumbor.importer import Importer
 
 
 class StatsdMetricsTestCase(TestCase):

tests/optimizers/test_gifv.py

@@ -9,9 +9,7 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from shutil import which
-from unittest import TestCase
-
-import mock
+from unittest import TestCase, mock
 
 from thumbor.config import Config
 from thumbor.context import Context, RequestParameters

tests/optimizers/test_jpegtran.py

@@ -8,9 +8,7 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-from unittest import TestCase
-
-import mock
+from unittest import TestCase, mock
 
 from thumbor.config import Config
 from thumbor.context import Context, RequestParameters

tests/result_storages/test_file_storage.py

@@ -11,8 +11,8 @@
 import tempfile
 from datetime import datetime
 from os.path import abspath, dirname, join
+from unittest import mock
 
-import mock
 from preggy import expect
 from tornado.testing import gen_test
 

tests/storages/test_file_storage.py

@@ -12,8 +12,8 @@
 from datetime import datetime
 from os.path import dirname, exists, join
 from tempfile import mkdtemp
+from unittest import mock
 
-import mock
 from preggy import expect
 from tornado.testing import gen_test
 

tests/test_config.py

@@ -9,12 +9,11 @@
 # Copyright (c) 2011 globo.com [email protected]
 
 from os.path import expanduser
-from unittest import TestCase
-import mock
+from unittest import TestCase, mock
 
 from preggy import expect
 
-from thumbor.config import generate_config, format_value, Config
+from thumbor.config import Config, format_value, generate_config
 
 
 class ConfigTestCase(TestCase):

tests/test_context.py

@@ -8,9 +8,8 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-from unittest import TestCase
+from unittest import TestCase, mock
 
-import mock
 from preggy import expect
 
 from thumbor.config import Config

tests/test_point.py

@@ -10,9 +10,8 @@
 
 from preggy import expect
 
-from thumbor.point import FocalPoint
-
 from tests.base import TestCase
+from thumbor.point import FocalPoint
 
 
 class FocalPointTestCase(TestCase):

tests/test_server.py

@@ -8,9 +8,8 @@
 # http://www.opensource.org/licenses/mit-license
 # Copyright (c) 2011 globo.com [email protected]
 
-from unittest import TestCase
+from unittest import TestCase, mock
 
-import mock
 from preggy import expect
 
 import thumbor.server