Make flake8 use built-in mock from unittest, if available (Python 3.4+)

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

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

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

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

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

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

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

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

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

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
 

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

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

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

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

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

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

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
 

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

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

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

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