Merge branch 'master' into mstfbl/bandit-security-fix

pytorch · Apr 6, 2021 · fe9c193 · fe9c193
2 parents fd52473 + c37f8a0
commit fe9c193
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.circleci/regenerate.py b/.circleci/regenerate.py
@@ -15,6 +15,7 @@
 """
 
 import jinja2
+from jinja2 import select_autoescape
 import yaml
 import os.path
 
@@ -184,7 +185,7 @@ def unittest_workflows(indentation=6):
     env = jinja2.Environment(
         loader=jinja2.FileSystemLoader(d),
         lstrip_blocks=True,
-        autoescape=False,
+        autoescape=select_autoescape(enabled_extensions=('html', 'xml')),
     )
 
     with open(os.path.join(d, 'config.yml'), 'w') as f:

diff --git a/.circleci/utils/test_sort_yaml.py b/.circleci/utils/test_sort_yaml.py
@@ -11,4 +11,4 @@
 import sys
 import yaml
 
-sys.stdout.write(yaml.dump(yaml.load(sys.stdin, Loader=yaml.FullLoader), sort_keys=True))
+sys.stdout.write(yaml.dump(yaml.safe_load(sys.stdin, Loader=yaml.FullLoader), sort_keys=True))