From 208a585bb624f43194b80f3c88e059f5213c58e1 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 15 Jul 2020 15:13:25 +0000 Subject: [PATCH] Revert "Make mock import python 2.7 compatible" We don't support py2.7 anymore, so this code is not needed. We've also removed mock from test-requirements, so it would not be present anyway. This reverts commit 0f883090916cf84309dddb1cdf6dd51265e36a0a. Change-Id: I06a541523f7da1bea7db5b5d16e4ce36a5031bb9 --- validations_common/library/__init__.py | 0 .../tests/library/test_check_package_update.py | 8 ++------ validations_common/tests/library/test_reportentry.py | 5 +---- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 validations_common/library/__init__.py diff --git a/validations_common/library/__init__.py b/validations_common/library/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/validations_common/tests/library/test_check_package_update.py b/validations_common/tests/library/test_check_package_update.py index b5f8f69..173d0fb 100644 --- a/validations_common/tests/library/test_check_package_update.py +++ b/validations_common/tests/library/test_check_package_update.py @@ -12,12 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -try: - from unittest.mock import MagicMock - from unittest.mock import patch -except ImportError: - from mock import MagicMock - from mock import patch +from unittest.mock import MagicMock +from unittest.mock import patch from validations_common.library.check_package_update import check_update from validations_common.library.check_package_update import get_package_details diff --git a/validations_common/tests/library/test_reportentry.py b/validations_common/tests/library/test_reportentry.py index d97ca34..92075a5 100644 --- a/validations_common/tests/library/test_reportentry.py +++ b/validations_common/tests/library/test_reportentry.py @@ -23,10 +23,7 @@ Tests for `reportentry` module. import validations_common.library.reportentry as validation from validations_common.tests import base -try: - from unittest import mock -except ImportError: - import mock +from unittest import mock reason = "Reason #1" recommendation = ['Recommendation #1']