Clean up Py2 dependencies and update to use native unittest.mock (#2299)

requirements/base.txt

@@ -1,6 +1,4 @@
-pyrsistent~=0.16.0; python_version<"3"
 boto3~=1.5
-enum34~=1.1; python_version<"3.4"
 jsonschema~=3.2
 six~=1.15
 

requirements/dev.txt

@@ -1,19 +1,16 @@
 coverage~=5.3
 flake8~=3.8.4
-tox~=3.20.1
+tox~=3.24
 pytest-cov~=2.10.1
-pytest-xdist~=1.34.0  # pytest-xdist 2 is not compatible with Python 2.7
+pytest-xdist~=2.5
 pylint>=1.7.2,<2.0
 pyyaml~=5.4
 
 # Test requirements
-pytest~=6.1.1; python_version >= '3.6'
-pytest~=4.6.11; python_version < '3.6' # pytest dropped python 2 support after 4.6.x
-mock>=3.0.5,<4.0.0  # 4.0.0 drops Python 2 support
+pytest~=6.2.5
 parameterized~=0.7.4
 
 # Integration tests
-pathlib2>=2.3.5; python_version < '3'
 click~=7.1
 dateparser~=0.7
 boto3~=1.17
@@ -25,4 +22,4 @@ requests~=2.24.0
 docopt~=0.6.2
 
 # formatter
-black==20.8b1; python_version >= '3.6'
+black==20.8b1

tests/feature_toggle/test_feature_toggle.py

@@ -1,4 +1,4 @@
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 from parameterized import parameterized, param
 from unittest import TestCase
 import os, sys

tests/intrinsics/test_actions.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 from samtranslator.intrinsics.actions import Action, RefAction, SubAction, GetAttAction, FindInMapAction
 from samtranslator.intrinsics.resource_refs import SupportedResourceReferences
 from samtranslator.model.exceptions import InvalidTemplateException, InvalidDocumentException

tests/intrinsics/test_resolver.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from samtranslator.intrinsics.resolver import IntrinsicsResolver
 from samtranslator.intrinsics.actions import Action
 from samtranslator.model.exceptions import InvalidDocumentException

tests/metrics/test_method_decorator.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, patch, ANY
+from unittest.mock import Mock, patch, ANY
 
 from samtranslator.metrics.method_decorator import (
     MetricsMethodWrapperSingleton,

tests/metrics/test_metrics.py

@@ -1,6 +1,6 @@
 from parameterized import parameterized, param
 from unittest import TestCase
-from mock import MagicMock, call, ANY
+from unittest.mock import MagicMock, call, ANY
 from samtranslator.metrics.metrics import (
     Metrics,
     MetricsPublisher,

tests/model/api/test_api_generator.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from parameterized import parameterized
 

tests/model/api/test_http_api_generator.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch
+from unittest.mock import patch
 import pytest
 from functools import reduce
 

tests/model/eventsources/test_api_event_source.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.eventsources.push import Api

tests/model/eventsources/test_cloudwatch_event_source.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.eventsources.push import CloudWatchEvent

tests/model/eventsources/test_cloudwatchlogs_event_source.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 from samtranslator.model.eventsources.cloudwatchlogs import CloudWatchLogs
 

tests/model/eventsources/test_eventbridge_rule_source.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.eventsources.push import EventBridgeRule

tests/model/eventsources/test_schedule_event_source.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.eventsources.push import Schedule

tests/model/eventsources/test_sns_event_source.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 from samtranslator.model.eventsources.push import SNS
 

tests/model/stepfunctions/test_api_event.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 
 from samtranslator.model.stepfunctions.events import Api

tests/model/stepfunctions/test_cloudwatchevents_event.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 from samtranslator.model.stepfunctions.events import CloudWatchEvent
 from samtranslator.model.exceptions import InvalidEventException

tests/model/stepfunctions/test_eventbridge_rule_source.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 
 from samtranslator.model.exceptions import InvalidEventException

tests/model/stepfunctions/test_schedule_event.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 from samtranslator.model.stepfunctions.events import Schedule
 from samtranslator.model.exceptions import InvalidEventException

tests/model/stepfunctions/test_state_machine_generator.py

@@ -1,4 +1,4 @@
-from mock import Mock
+from unittest.mock import Mock
 from unittest import TestCase
 
 from samtranslator.model import ResourceTypeResolver

tests/model/test_api_v2.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
+from unittest import mock
 import pytest
-import mock
 
 from samtranslator.model import InvalidResourceException
 from samtranslator.model.apigatewayv2 import ApiGatewayV2Authorizer

tests/model/test_function_policies.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.function_policies import FunctionPolicies, PolicyTypes, PolicyEntry

tests/model/test_resource_policies.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.model.resource_policies import ResourcePolicies, PolicyTypes, PolicyEntry

tests/model/test_sam_resources.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch
+from unittest.mock import patch
 import pytest
 
 from samtranslator.intrinsics.resolver import IntrinsicsResolver

tests/parser/test_parser.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch, Mock, call
+from unittest.mock import patch, Mock, call
 
 from samtranslator.parser.parser import Parser
 from samtranslator.plugins import LifeCycleEvents

tests/plugins/api/test_default_definition_body_plugin.py

@@ -1,4 +1,4 @@
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 
 from samtranslator.plugins.api.default_definition_body_plugin import DefaultDefinitionBodyPlugin

tests/plugins/api/test_implicit_api_plugin.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
 
 from samtranslator.public.sdk.resource import SamResource, SamResourceType
 from samtranslator.public.exceptions import InvalidEventException, InvalidResourceException, InvalidDocumentException

tests/plugins/application/test_serverless_app_plugin.py

@@ -2,7 +2,7 @@
 import itertools
 from botocore.exceptions import ClientError
 
-from mock import Mock, patch
+from unittest.mock import Mock, patch
 from unittest import TestCase
 from parameterized import parameterized, param
 

tests/plugins/globals/test_globals.py

@@ -1,7 +1,7 @@
 from parameterized import parameterized
 
 from unittest import TestCase
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 
 from samtranslator.plugins.globals.globals import GlobalProperties, Globals, InvalidGlobalsSectionException
 

tests/plugins/globals/test_globals_plugin.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch
+from unittest.mock import patch
 
 from samtranslator.public.exceptions import InvalidDocumentException
 from samtranslator.public.plugins import BasePlugin

tests/plugins/policies/test_policy_templates_plugin.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, MagicMock, patch, call
+from unittest.mock import Mock, MagicMock, patch, call
 
 from samtranslator.plugins import BasePlugin
 from samtranslator.model.resource_policies import PolicyTypes, PolicyEntry

tests/policy_template_processor/test_processor.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import mock_open, Mock, patch
+from unittest.mock import mock_open, Mock, patch
 
 import jsonschema
 import json

tests/policy_template_processor/test_template.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import Mock, patch, ANY
+from unittest.mock import Mock, patch, ANY
 
 from samtranslator.policy_template_processor.template import Template
 from samtranslator.policy_template_processor.exceptions import InvalidParameterValues, InsufficientParameterValues

tests/sdk/test_parameter.py

@@ -2,7 +2,7 @@
 
 from unittest import TestCase
 from samtranslator.sdk.parameter import SamParameterValues
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 
 from samtranslator.translator.arn_generator import NoRegionFound
 

tests/swagger/test_swagger.py

@@ -1,7 +1,7 @@
 import copy
 
 from unittest import TestCase
-from mock import Mock
+from unittest.mock import Mock
 from parameterized import parameterized, param
 
 from samtranslator.swagger.swagger import SwaggerEditor

tests/test_model.py

@@ -1,7 +1,7 @@
 import pytest
 
 from unittest import TestCase
-from mock import Mock, call, ANY
+from unittest.mock import Mock, call, ANY
 from samtranslator.model.exceptions import InvalidResourceException
 from samtranslator.model import PropertyType, Resource, SamResourceMacro, ResourceTypeResolver
 from samtranslator.intrinsics.resource_refs import SupportedResourceReferences

tests/test_plugins.py

@@ -2,7 +2,7 @@
 from samtranslator.plugins import SamPlugins, BasePlugin, LifeCycleEvents
 
 from unittest import TestCase
-from mock import Mock, patch, call
+from unittest.mock import Mock, patch, call
 
 
 class TestSamPluginsRegistration(TestCase):

tests/translator/model/preferences/test_deployment_preference_collection.py

@@ -1,4 +1,4 @@
-from mock import patch
+from unittest.mock import patch
 from unittest import TestCase
 
 from samtranslator.model.codedeploy import CodeDeployApplication

tests/translator/test_api_resource.py

@@ -2,7 +2,7 @@
 import os
 
 from unittest import TestCase
-from mock import MagicMock, patch
+from unittest.mock import MagicMock, patch
 from tests.translator.helpers import get_template_parameter_values
 from samtranslator.translator.transform import transform
 from samtranslator.model.apigateway import ApiGatewayDeployment

tests/translator/test_arn_generator.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 from parameterized import parameterized
-from mock import patch
+from unittest.mock import patch
 
 from samtranslator.translator.arn_generator import ArnGenerator, NoRegionFound
 

tests/translator/test_function_resources.py

@@ -1,5 +1,5 @@
 from unittest import TestCase
-from mock import patch, Mock
+from unittest.mock import patch, Mock
 import os
 from samtranslator.model.sam_resources import SamFunction
 from samtranslator.model.lambda_ import LambdaAlias, LambdaVersion, LambdaFunction

tests/translator/test_logical_id_generator.py

@@ -2,7 +2,7 @@
 import json
 
 from unittest import TestCase
-from mock import patch
+from unittest.mock import patch
 from samtranslator.translator.logical_id_generator import LogicalIdGenerator
 
 

tests/translator/test_managed_policies_translator.py

@@ -1,4 +1,4 @@
-from mock import MagicMock
+from unittest.mock import MagicMock
 from samtranslator.translator.managed_policy_translator import ManagedPolicyLoader
 
 

tests/translator/test_resource_level_attributes.py

@@ -1,5 +1,5 @@
 import itertools
-from mock import patch
+from unittest.mock import patch
 
 from parameterized import parameterized
 

tests/translator/test_translator.py

@@ -22,7 +22,7 @@
 import yaml
 from unittest import TestCase
 from samtranslator.translator.transform import transform
-from mock import Mock, MagicMock, patch
+from unittest.mock import Mock, MagicMock, patch
 
 BASE_PATH = os.path.dirname(__file__)
 INPUT_FOLDER = BASE_PATH + "/input"

tests/unit/model/preferences/test_deployment_preference_collection.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from mock import patch
+from unittest.mock import patch
 from parameterized import parameterized
 
 from samtranslator.model.preferences.deployment_preference_collection import DeploymentPreferenceCollection

tests/unit/test_region_configuration.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from mock import patch
+from unittest.mock import patch
 from parameterized import parameterized
 
 from samtranslator.region_configuration import RegionConfiguration

tests/unit/translator/test_arn_generator.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from mock import patch
+from unittest.mock import patch
 from parameterized import parameterized
 
 from samtranslator.translator.arn_generator import ArnGenerator

tests/utils/test_py27hash_fix.py

@@ -1,7 +1,7 @@
 import copy
 
 from unittest import TestCase
-from mock import patch
+from unittest.mock import patch
 from samtranslator.utils.py27hash_fix import (
     Py27Dict,
     Py27Keys,