summaryrefslogtreecommitdiffstats
path: root/lib/ansible/utils/vars.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/utils/vars.py')
-rw-r--r--lib/ansible/utils/vars.py14
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/ansible/utils/vars.py b/lib/ansible/utils/vars.py
index 5e21cb3..373fc70 100644
--- a/lib/ansible/utils/vars.py
+++ b/lib/ansible/utils/vars.py
@@ -15,9 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>.
-# Make coding more python3-ish
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
+from __future__ import annotations
import keyword
import random
@@ -85,11 +83,11 @@ def combine_vars(a, b, merge=None):
if merge or merge is None and C.DEFAULT_HASH_BEHAVIOUR == "merge":
return merge_hash(a, b)
- else:
- # HASH_BEHAVIOUR == 'replace'
- _validate_mutable_mappings(a, b)
- result = a | b
- return result
+
+ # HASH_BEHAVIOUR == 'replace'
+ _validate_mutable_mappings(a, b)
+ result = a | b
+ return result
def merge_hash(x, y, recursive=True, list_merge='replace'):