Fix merge conflicts.

Author: Kami

st2actions/st2actions/policies/retry.py

@@ -26,7 +26,7 @@
 from st2common.constants.action import LIVEACTION_STATUS_TIMED_OUT
 from st2common.util.enum import Enum
 from st2common.policies.base import ResourcePolicyApplicator
-from st2common.util.ujson import fast_deepcopy
+from st2common.util.deep_copy import fast_deepcopy_dict
 
 __all__ = ["RetryOnPolicy", "ExecutionRetryPolicyApplicator"]
 
@@ -179,7 +179,7 @@ def _re_run_live_action(self, live_action_db):
 
         # Add additional policy specific info to the context
         context = getattr(live_action_db, "context", {})
-        new_context = fast_deepcopy(context)
+        new_context = fast_deepcopy_dict(context)
         new_context["policies"] = {}
         new_context["policies"]["retry"] = {
             "applied_policy": self._policy_ref,

st2api/st2api/controllers/v1/triggers.py

@@ -29,7 +29,7 @@
 from st2common.transport.reactor import TriggerDispatcher
 from st2common.util import isotime
 from st2common.validators.api.misc import validate_not_part_of_system_pack
-from st2common.util.ujson import fast_deepcopy
+from st2common.util.deep_copy import fast_deepcopy_dict
 
 http_client = six.moves.http_client
 
@@ -398,7 +398,7 @@ def post(self, trigger_instance_id):
             id=trigger_instance_id, permission_type=None, requester_user=None
         )
 
-        new_payload = fast_deepcopy(existing_trigger_instance.payload)
+        new_payload = fast_deepcopy_dict(existing_trigger_instance.payload)
         new_payload["__context"] = {"original_id": trigger_instance_id}
 
         try:

st2common/st2common/logging/formatters.py

@@ -25,7 +25,7 @@
 
 from st2common.constants.secrets import MASKED_ATTRIBUTES_BLACKLIST
 from st2common.constants.secrets import MASKED_ATTRIBUTE_VALUE
-from st2common.util.ujson import fast_deepcopy
+from st2common.util.deep_copy import fast_deepcopy_dict
 
 __all__ = [
     "ConsoleLogFormatter",
@@ -87,7 +87,7 @@ def process_attribute_value(key, value):
             value = MASKED_ATTRIBUTE_VALUE
     elif isinstance(value, dict):
         # Note: We don't want to modify the original value
-        value = fast_deepcopy(value)
+        value = fast_deepcopy_dict(value)
 
         for dict_key, dict_value in six.iteritems(value):
             value[dict_key] = process_attribute_value(key=dict_key, value=dict_value)

st2common/st2common/services/inquiry.py

@@ -33,7 +33,7 @@
 from st2common.util import date as date_utils
 from st2common.util import schema as schema_utils
 from st2common.util import system_info as sys_info_utils
-from st2common.util.ujson import fast_deepcopy
+from st2common.util.deep_copy import fast_deepcopy_dict
 
 
 LOG = logging.getLogger(__name__)
@@ -154,7 +154,7 @@ def respond(inquiry, response, requester=None):
     # Succeed the liveaction and update result with the inquiry response.
     LOG.debug('Updating response for inquiry "%s".' % str(inquiry.id))
 
-    result = fast_deepcopy(inquiry.result)
+    result = fast_deepcopy_dict(inquiry.result)
     result["response"] = response
 
     liveaction_db = action_utils.update_liveaction_status(

st2common/st2common/util/schema/__init__.py

@@ -25,7 +25,7 @@
 from st2common.exceptions.action import InvalidActionParameterException
 from st2common.util import jsonify
 from st2common.util.misc import deep_update
-from st2common.util.ujson import fast_deepcopy
+from st2common.util.deep_copy import fast_deepcopy_dict
 
 __all__ = [
     "get_validator",
@@ -80,7 +80,7 @@
 
 
 def get_draft_schema(version="custom", additional_properties=False):
-    schema = fast_deepcopy(SCHEMAS[version])
+    schema = fast_deepcopy_dict(SCHEMAS[version])
     if additional_properties and "additionalProperties" in schema:
         del schema["additionalProperties"]
     return schema
@@ -199,7 +199,7 @@ def assign_default_values(instance, schema):
     """
     Assign default values on the provided instance based on the schema default specification.
     """
-    instance = fast_deepcopy(instance)
+    instance = fast_deepcopy_dict(instance)
     instance_is_dict = isinstance(instance, dict)
     instance_is_array = isinstance(instance, list)
 
@@ -262,7 +262,7 @@ def modify_schema_allow_default_none(schema):
     Manipulate the provided schema so None is also an allowed value for each attribute which
     defines a default value of None.
     """
-    schema = fast_deepcopy(schema)
+    schema = fast_deepcopy_dict(schema)
     properties = schema.get("properties", {})
 
     for property_name, property_data in six.iteritems(properties):
@@ -336,7 +336,7 @@ def validate(
     :param use_default: True to support the use of the optional "default" property.
     :type use_default: ``bool``
     """
-    instance = fast_deepcopy(instance)
+    instance = fast_deepcopy_dict(instance)
     schema_type = schema.get("type", None)
     instance_is_dict = isinstance(instance, dict)