File remove_mock_dependency.patch of Package python-flake8

Overview Repositories Revisions Requests Users Attributes Meta

File remove_mock_dependency.patch of Package python-flake8 (Revision 13f15a6cac4b54a01f003d5741d60038)

Currently displaying revision 13f15a6cac4b54a01f003d5741d60038 , Show latest

--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import checker
--- a/tests/unit/test_application.py
+++ b/tests/unit/test_application.py
@@ -1,7 +1,10 @@
 """Tests for the Application class."""
 import optparse
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import exceptions
--- a/tests/unit/test_base_formatter.py
+++ b/tests/unit/test_base_formatter.py
@@ -1,7 +1,10 @@
 """Tests for the BaseFormatter object."""
 import optparse
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import style_guide
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import checker
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8.options import config
--- a/tests/unit/test_debug.py
+++ b/tests/unit/test_debug.py
@@ -1,5 +1,8 @@
 """Tests for our debugging module."""
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 import setuptools
 
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 from flake8 import checker
 
--- a/tests/unit/test_file_processor.py
+++ b/tests/unit/test_file_processor.py
@@ -5,7 +5,10 @@ import tokenize
 
 from flake8 import processor
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 from flake8.options import config
 
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8.main import git
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8.api import legacy as api
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8.options import config
--- a/tests/unit/test_option.py
+++ b/tests/unit/test_option.py
@@ -1,5 +1,8 @@
 """Unit tests for flake8.options.manager.Option."""
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8.options import manager
--- a/tests/unit/test_option_manager.py
+++ b/tests/unit/test_option_manager.py
@@ -2,7 +2,10 @@
 import optparse
 import os
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import utils
--- a/tests/unit/test_plugin.py
+++ b/tests/unit/test_plugin.py
@@ -1,7 +1,10 @@
 """Tests for flake8.plugins.manager.Plugin."""
 import optparse
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import exceptions
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 
 from flake8.plugins import manager
 
--- a/tests/unit/test_plugin_type_manager.py
+++ b/tests/unit/test_plugin_type_manager.py
@@ -1,7 +1,10 @@
 """Tests for flake8.plugins.manager.PluginTypeManager."""
 import collections
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import exceptions
--- 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 optparse
 
-import mock
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import style_guide
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import utils
--- 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:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import pytest
 
 from flake8 import style_guide
--- a/setup.py
+++ b/setup.py
@@ -11,8 +11,12 @@ sys.path.insert(0, os.path.join(os.path.
 
 import flake8
 
+PY2 = sys.version_info[0] == 2
 
-tests_require = ['mock >= 2.0.0', 'pytest']
+tests_require = ['pytest']
+
+if PY2:
+    tests_require.append('mock >= 2.0.0')
 
 # NOTE(sigmavirus24): When updating these requirements, update them in
 # setup.cfg as well.

Places

File remove_mock_dependency.patch of Package python-flake8 (Revision 13f15a6cac4b54a01f003d5741d60038)

Places