From cd7c340545eb14fde9b56ad97175a3329c241572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 5 Oct 2021 13:33:50 +0200 Subject: [PATCH] deps: V8: patch jinja2 for Python 3.10 compat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/40296 Backport-PR-URL: https://github.com/nodejs/node/pull/40689 Fixes: https://github.com/nodejs/node/issues/40294 Reviewed-By: Jiawen Geng Reviewed-By: James M Snell Reviewed-By: Richard Lau Reviewed-By: Christian Clauss Reviewed-By: Michaël Zasso --- common.gypi | 2 +- deps/v8/third_party/jinja2/tests.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common.gypi b/common.gypi index b16f643d46d54d..f3a4aad62abef6 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.84', + 'v8_embedder_string': '-node.85', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/third_party/jinja2/tests.py b/deps/v8/third_party/jinja2/tests.py index 0adc3d4dbcbb88..39c7360253a709 100644 --- a/deps/v8/third_party/jinja2/tests.py +++ b/deps/v8/third_party/jinja2/tests.py @@ -10,7 +10,10 @@ """ import operator import re -from collections import Mapping +try: + from collections.abc import Mapping +except ImportError: + from collections import Mapping from jinja2.runtime import Undefined from jinja2._compat import text_type, string_types, integer_types import decimal