From 78598bcc07473f497862b107d7b2c9b5e235f897 Mon Sep 17 00:00:00 2001
From: Samuel Searles-Bryant <samuel.searles-bryant@unipart.io>
Date: Fri, 26 Apr 2019 12:10:38 +0100
Subject: [PATCH] [FIX] yaml: Specify loader to YAML constructors
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

pyYAML 5.1 is now the distro version. This introduces the FullLoader as
the default loader used with yaml.load(…), however the default loader for
yaml.add_constructor(…) has not been updated (This is a known issue:
yaml/pyyaml#274).
This commit specifies the loader to be used when adding constructors,
using the FullLoader if it exists and the older Loader if not (i.e.
depending on which version of pyYAML is installed).

Task: 3958

Signed-off-by: Samuel Searles-Bryant <samuel.searles-bryant@unipart.io>
---
 odoo/tools/yaml_tag.py | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/odoo/tools/yaml_tag.py b/odoo/tools/yaml_tag.py
index eb9c6357ae8a5..ea9179ed31def 100644
--- a/odoo/tools/yaml_tag.py
+++ b/odoo/tools/yaml_tag.py
@@ -149,16 +149,24 @@ def ref_constructor(loader, tag_suffix, node):
 # Constructors are actually defined globally: do not redefined them in another
 # class/file/package.  This means that module recorder need import this file.
 def add_constructors():
-    yaml.add_constructor(u"!assert", assert_constructor)
-    yaml.add_constructor(u"!record", record_constructor)
-    yaml.add_constructor(u"!python", python_constructor)
-    yaml.add_constructor(u"!menuitem", menuitem_constructor)
-    yaml.add_constructor(u"!act_window", act_window_constructor)
-    yaml.add_constructor(u"!function", function_constructor)
-    yaml.add_constructor(u"!report", report_constructor)
-    yaml.add_constructor(u"!context", context_constructor)
-    yaml.add_constructor(u"!delete", delete_constructor)
-    yaml.add_constructor(u"!url", url_constructor)
-    yaml.add_constructor(u"!eval", eval_constructor)
-    yaml.add_multi_constructor(u"!ref", ref_constructor)
+    constructors = [
+        ("!assert", assert_constructor),
+        ("!record", record_constructor),
+        ("!python", python_constructor),
+        ("!menuitem", menuitem_constructor),
+        ("!act_window", act_window_constructor),
+        ("!function", function_constructor),
+        ("!report", report_constructor),
+        ("!context", context_constructor),
+        ("!delete", delete_constructor),
+        ("!url", url_constructor),
+        ("!eval", eval_constructor),
+        ("!ref", ref_constructor),
+    ]
+    try:
+        loader = yaml.FullLoader  # default for pyYAML>=5.1. Does not exist in earlier versions.
+    except AttributeError:
+        loader = yaml.Loader  # default for pyYAML<5.1
+    for tag, constructor in constructors:
+        yaml.add_constructor(tag, constructor, Loader=loader)
 add_constructors()