| 1 |
commit: 395a79e92252013dc32270969a3338e1d191b962 |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 16 18:15:32 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 16 18:17:39 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395a79e9 |
| 7 |
|
| 8 |
net-libs/nodejs: more collections.abc fixes in jinja |
| 9 |
|
| 10 |
Suggested-by: Jens Brandt <gentoo <AT> brandt-george.de> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/20816 |
| 12 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 13 |
|
| 14 |
.../nodejs-12.22.1-jinja_collections_abc.patch | 84 ++++++++++++++++++++++ |
| 15 |
1 file changed, 84 insertions(+) |
| 16 |
|
| 17 |
diff --git a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch |
| 18 |
index 45be8cb07f8..5f0df09b6e2 100644 |
| 19 |
--- a/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch |
| 20 |
+++ b/net-libs/nodejs/files/nodejs-12.22.1-jinja_collections_abc.patch |
| 21 |
@@ -9,3 +9,87 @@ |
| 22 |
from jinja2.runtime import Undefined |
| 23 |
from jinja2._compat import text_type, string_types, integer_types |
| 24 |
import decimal |
| 25 |
+--- a/deps/v8/third_party/jinja2/runtime.py |
| 26 |
++++ b/deps/v8/third_party/jinja2/runtime.py |
| 27 |
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)): |
| 28 |
+ |
| 29 |
+ # register the context as mapping if possible |
| 30 |
+ try: |
| 31 |
+- from collections import Mapping |
| 32 |
++ from collections.abc import Mapping |
| 33 |
+ Mapping.register(Context) |
| 34 |
+ except ImportError: |
| 35 |
+ pass |
| 36 |
+--- a/deps/v8/third_party/jinja2/sandbox.py |
| 37 |
++++ b/deps/v8/third_party/jinja2/sandbox.py |
| 38 |
+@@ -14,7 +14,7 @@ |
| 39 |
+ """ |
| 40 |
+ import types |
| 41 |
+ import operator |
| 42 |
+-from collections import Mapping |
| 43 |
++from collections.abc import Mapping |
| 44 |
+ from jinja2.environment import Environment |
| 45 |
+ from jinja2.exceptions import SecurityError |
| 46 |
+ from jinja2._compat import string_types, PY2 |
| 47 |
+@@ -79,7 +79,7 @@ except ImportError: |
| 48 |
+ pass |
| 49 |
+ |
| 50 |
+ #: register Python 2.6 abstract base classes |
| 51 |
+-from collections import MutableSet, MutableMapping, MutableSequence |
| 52 |
++from collections.abc import MutableSet, MutableMapping, MutableSequence |
| 53 |
+ _mutable_set_types += (MutableSet,) |
| 54 |
+ _mutable_mapping_types += (MutableMapping,) |
| 55 |
+ _mutable_sequence_types += (MutableSequence,) |
| 56 |
+--- a/deps/v8/third_party/jinja2/utils.py |
| 57 |
++++ b/deps/v8/third_party/jinja2/utils.py |
| 58 |
+@@ -482,7 +482,7 @@ class LRUCache(object): |
| 59 |
+ |
| 60 |
+ # register the LRU cache as mutable mapping if possible |
| 61 |
+ try: |
| 62 |
+- from collections import MutableMapping |
| 63 |
++ from collections.abc import MutableMapping |
| 64 |
+ MutableMapping.register(LRUCache) |
| 65 |
+ except ImportError: |
| 66 |
+ pass |
| 67 |
+--- a/tools/inspector_protocol/jinja2/runtime.py |
| 68 |
++++ b/tools/inspector_protocol/jinja2/runtime.py |
| 69 |
+@@ -315,7 +315,7 @@ class Context(with_metaclass(ContextMeta)): |
| 70 |
+ |
| 71 |
+ # register the context as mapping if possible |
| 72 |
+ try: |
| 73 |
+- from collections import Mapping |
| 74 |
++ from collections.abc import Mapping |
| 75 |
+ Mapping.register(Context) |
| 76 |
+ except ImportError: |
| 77 |
+ pass |
| 78 |
+--- a/tools/inspector_protocol/jinja2/sandbox.py |
| 79 |
++++ b/tools/inspector_protocol/jinja2/sandbox.py |
| 80 |
+@@ -14,7 +14,7 @@ |
| 81 |
+ """ |
| 82 |
+ import types |
| 83 |
+ import operator |
| 84 |
+-from collections import Mapping |
| 85 |
++from collections.abc import Mapping |
| 86 |
+ from jinja2.environment import Environment |
| 87 |
+ from jinja2.exceptions import SecurityError |
| 88 |
+ from jinja2._compat import string_types, PY2 |
| 89 |
+@@ -79,7 +79,7 @@ except ImportError: |
| 90 |
+ pass |
| 91 |
+ |
| 92 |
+ #: register Python 2.6 abstract base classes |
| 93 |
+-from collections import MutableSet, MutableMapping, MutableSequence |
| 94 |
++from collections.abc import MutableSet, MutableMapping, MutableSequence |
| 95 |
+ _mutable_set_types += (MutableSet,) |
| 96 |
+ _mutable_mapping_types += (MutableMapping,) |
| 97 |
+ _mutable_sequence_types += (MutableSequence,) |
| 98 |
+--- a/tools/inspector_protocol/jinja2/tests.py |
| 99 |
++++ b/tools/inspector_protocol/jinja2/tests.py |
| 100 |
+@@ -10,7 +10,7 @@ |
| 101 |
+ """ |
| 102 |
+ import operator |
| 103 |
+ import re |
| 104 |
+-from collections import Mapping |
| 105 |
++from collections.abc import Mapping |
| 106 |
+ from jinja2.runtime import Undefined |
| 107 |
+ from jinja2._compat import text_type, string_types, integer_types |
| 108 |
+ import decimal |
Archives