minor py3 fixes

This commit is contained in:
Tom spot Callaway 2021-07-28 15:57:57 -04:00
parent 239fe17bbe
commit edc94b008f
2 changed files with 20 additions and 0 deletions

View File

@ -0,0 +1,17 @@
diff -up chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 chromium-92.0.4515.107/third_party/jinja2/tests.py
--- chromium-92.0.4515.107/third_party/jinja2/tests.py.py3 2021-07-28 15:53:45.670961029 -0400
+++ chromium-92.0.4515.107/third_party/jinja2/tests.py 2021-07-28 15:55:56.637013096 -0400
@@ -10,7 +10,12 @@
"""
import operator
import re
-from collections import Mapping
+import sys
+if sys.version_info[:2] >= (3, 8): # pragma: no cover
+ from collections.abc import Mapping
+else: # pragma: no cover
+ from collections import Mapping
+
from jinja2.runtime import Undefined
from jinja2._compat import text_type, string_types, integer_types
import decimal

View File

@ -316,6 +316,8 @@ Patch79: chromium-90.0.4430.72-widevine-no-download.patch
Patch80: chromium-92.0.4515.107-EnumTable-crash.patch
# https://github.com/stha09/chromium-patches/blob/master/chromium-92-v8-constexpr.patch
Patch82: chromium-92-v8-constexpr.patch
# Fixes for python3
Patch83: chromium-92.0.4515.107-py3-fixes.patch
# Use lstdc++ on EPEL7 only
@ -984,6 +986,7 @@ udev.
%patch79 -p1 -b .widevine-no-download
%patch80 -p1 -b .EnumTable-crash
%patch82 -p1 -b .v8-constexpr
%patch83 -p1 -b .py3fixes
# Fedora branded user agent
%if 0%{?fedora}