diff --git a/tests/integration/test_checker.py b/tests/integration/test_checker.py index ca3ed4f..73c26bd 100644 --- a/tests/integration/test_checker.py +++ b/tests/integration/test_checker.py @@ -1,5 +1,8 @@ """Integration tests for the checker submodule.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import checker diff --git a/tests/integration/test_main.py b/tests/integration/test_main.py index 72e9621..b9ec167 100644 --- a/tests/integration/test_main.py +++ b/tests/integration/test_main.py @@ -2,7 +2,10 @@ import json import os -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import utils diff --git a/tests/unit/test_application.py b/tests/unit/test_application.py index 8e5c9d5..085791b 100644 --- a/tests/unit/test_application.py +++ b/tests/unit/test_application.py @@ -2,7 +2,10 @@ import argparse import sys -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.main import application as app diff --git a/tests/unit/test_base_formatter.py b/tests/unit/test_base_formatter.py index 7a85554..502a863 100644 --- a/tests/unit/test_base_formatter.py +++ b/tests/unit/test_base_formatter.py @@ -1,7 +1,10 @@ """Tests for the BaseFormatter object.""" import argparse -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import style_guide diff --git a/tests/unit/test_checker_manager.py b/tests/unit/test_checker_manager.py index 2a6998e..e39dd90 100644 --- a/tests/unit/test_checker_manager.py +++ b/tests/unit/test_checker_manager.py @@ -1,7 +1,10 @@ """Tests for the Manager object for FileCheckers.""" import errno -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import checker diff --git a/tests/unit/test_config_file_finder.py b/tests/unit/test_config_file_finder.py index c51e1f2..2947dc8 100644 --- a/tests/unit/test_config_file_finder.py +++ b/tests/unit/test_config_file_finder.py @@ -4,7 +4,10 @@ import configparser import os import sys -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.options import config diff --git a/tests/unit/test_debug.py b/tests/unit/test_debug.py index c973abb..4c18469 100644 --- a/tests/unit/test_debug.py +++ b/tests/unit/test_debug.py @@ -1,6 +1,9 @@ """Tests for our debugging module.""" import entrypoints -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.main import debug diff --git a/tests/unit/test_file_checker.py b/tests/unit/test_file_checker.py index c4ee2bf..e6f3d80 100644 --- a/tests/unit/test_file_checker.py +++ b/tests/unit/test_file_checker.py @@ -1,5 +1,8 @@ """Unit tests for the FileChecker class.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest import flake8 diff --git a/tests/unit/test_file_processor.py b/tests/unit/test_file_processor.py index c3ae021..6c57d23 100644 --- a/tests/unit/test_file_processor.py +++ b/tests/unit/test_file_processor.py @@ -2,7 +2,10 @@ import ast import tokenize -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import processor diff --git a/tests/unit/test_get_local_plugins.py b/tests/unit/test_get_local_plugins.py index b2f985e..e85f4f2 100644 --- a/tests/unit/test_get_local_plugins.py +++ b/tests/unit/test_get_local_plugins.py @@ -1,5 +1,8 @@ """Tests for get_local_plugins.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock from flake8.options import config diff --git a/tests/unit/test_git.py b/tests/unit/test_git.py index 24d4b5b..1205ba9 100644 --- a/tests/unit/test_git.py +++ b/tests/unit/test_git.py @@ -1,5 +1,8 @@ """Tests around functionality in the git integration.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.main import git diff --git a/tests/unit/test_legacy_api.py b/tests/unit/test_legacy_api.py index 1d6a3e2..0cabc4d 100644 --- a/tests/unit/test_legacy_api.py +++ b/tests/unit/test_legacy_api.py @@ -1,5 +1,8 @@ """Tests for Flake8's legacy API.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.api import legacy as api diff --git a/tests/unit/test_merged_config_parser.py b/tests/unit/test_merged_config_parser.py index 1112a0d..d386d9e 100644 --- a/tests/unit/test_merged_config_parser.py +++ b/tests/unit/test_merged_config_parser.py @@ -1,7 +1,10 @@ """Unit tests for flake8.options.config.MergedConfigParser.""" import os -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.options import config diff --git a/tests/unit/test_option.py b/tests/unit/test_option.py index ba6b672..a97157b 100644 --- a/tests/unit/test_option.py +++ b/tests/unit/test_option.py @@ -1,7 +1,10 @@ """Unit tests for flake8.options.manager.Option.""" import functools -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8.options import manager diff --git a/tests/unit/test_option_manager.py b/tests/unit/test_option_manager.py index b384a31..6477864 100644 --- a/tests/unit/test_option_manager.py +++ b/tests/unit/test_option_manager.py @@ -2,7 +2,10 @@ import argparse import os -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import utils diff --git a/tests/unit/test_plugin.py b/tests/unit/test_plugin.py index 402eac8..2686198 100644 --- a/tests/unit/test_plugin.py +++ b/tests/unit/test_plugin.py @@ -1,7 +1,10 @@ """Tests for flake8.plugins.manager.Plugin.""" import argparse -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import exceptions diff --git a/tests/unit/test_plugin_manager.py b/tests/unit/test_plugin_manager.py index 72959b0..3d787f9 100644 --- a/tests/unit/test_plugin_manager.py +++ b/tests/unit/test_plugin_manager.py @@ -1,5 +1,8 @@ """Tests for flake8.plugins.manager.PluginManager.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock from flake8.plugins import manager diff --git a/tests/unit/test_plugin_type_manager.py b/tests/unit/test_plugin_type_manager.py index 4174c58..2679502 100644 --- a/tests/unit/test_plugin_type_manager.py +++ b/tests/unit/test_plugin_type_manager.py @@ -1,5 +1,8 @@ """Tests for flake8.plugins.manager.PluginTypeManager.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import exceptions diff --git a/tests/unit/test_style_guide.py b/tests/unit/test_style_guide.py index 38121c1..2c349bd 100644 --- a/tests/unit/test_style_guide.py +++ b/tests/unit/test_style_guide.py @@ -1,7 +1,10 @@ """Tests for the flake8.style_guide.StyleGuide class.""" import argparse -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import statistics diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 151a76d..28696e9 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,7 +1,10 @@ """Tests for flake8's utils module.""" import os -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import exceptions diff --git a/tests/unit/test_violation.py b/tests/unit/test_violation.py index a3a56f0..cca21f7 100644 --- a/tests/unit/test_violation.py +++ b/tests/unit/test_violation.py @@ -1,5 +1,8 @@ """Tests for the flake8.style_guide.Violation class.""" -import mock +try: + from unittest import mock +except (ImportError, AttributeError): + import mock import pytest from flake8 import style_guide