Merge ~liushuyu-011/ubuntu/+source/qt6-webengine:ubuntu/devel into ubuntu/+source/qt6-webengine:ubuntu/devel

[Zixing Liu]

This MP fixes a minor issue with Python 3.12 removing the imp module, but several Chromium build scripts still reference it.

The patches are cherry-picked from Chromium upstream.

[Steve Langasek (vorlon)]

please include a changelog entry for this.

review: Needs Fixing

[Steve Langasek (vorlon)]

review: Approve

05b7380... by Zixing Liu on 2024-03-16

Add another round of patches from Chromium/v8 upstream

Unmerged commits

05b7380... by Zixing Liu on 2024-03-16

Add another round of patches from Chromium/v8 upstream

diff --git a/debian/changelog b/debian/changelog
index 201cbfb..77e8472 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qt6-webengine (6.4.2-final+dfsg-12ubuntu4) UNRELEASED; urgency=medium
+
+  * Add another batch of patches from Chromium and v8 upstream to fix
+    futher Python 3.12 compatibility issues.
+
+ -- Zixing Liu <[e-mail]>  Fri, 15 Mar 2024 20:16:14 -0600
+
 qt6-webengine (6.4.2-final+dfsg-12ubuntu3) noble; urgency=medium
 
   * Add patches from Chromium upstream to fix Python 3.12 compatibility
diff --git a/debian/patches/drop_python2_support.patch b/debian/patches/drop_python2_support.patch
new file mode 100644
index 0000000..923fb68
--- /dev/null
+++ b/debian/patches/drop_python2_support.patch
@@ -0,0 +1,1836 @@
+From b3abd7e4c9467415da3a5e13d9500d2ab3abc2ec Mon Sep 17 00:00:00 2001
+From: Takuto Ikuta <[e-mail]>
+Date: Tue, 17 Jan 2023 01:16:33 +0000
+Subject: [PATCH] grit: drop python2 compatibility
+
+We use python3 only for build now.
+
+Bug: 1406153
+Change-Id: I7a06b7976bb7ffe4d045f7f10367a18ecafc2808
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4170036
+Auto-Submit: Takuto Ikuta <[e-mail]>
+Reviewed-by: Andrew Grieve <[e-mail]>
+Commit-Queue: Takuto Ikuta <[e-mail]>
+Cr-Commit-Position: refs/heads/main@{#1093176}
+---
+ tools/grit/grit/format/c_format.py            |  6 +--
+ tools/grit/grit/format/c_format_unittest.py   | 11 ++--
+ .../format/chrome_messages_json_unittest.py   | 19 +++----
+ tools/grit/grit/format/data_pack.py           |  7 +--
+ .../format/gen_predetermined_ids_unittest.py  | 11 ++--
+ tools/grit/grit/format/minifier.py            |  4 --
+ tools/grit/grit/format/rc.py                  | 10 ++--
+ tools/grit/grit/format/rc_unittest.py         | 31 ++++++-----
+ .../grit/gather/admin_template_unittest.py    | 34 ++++++------
+ tools/grit/grit/gather/interface.py           |  6 +--
+ tools/grit/grit/gather/policy_json.py         | 10 ++--
+ .../grit/grit/gather/policy_json_unittest.py  | 31 +++++------
+ tools/grit/grit/gather/rc_unittest.py         | 50 ++++++++++-------
+ tools/grit/grit/gather/skeleton_gatherer.py   | 11 ++--
+ tools/grit/grit/gather/tr_html.py             | 14 ++---
+ tools/grit/grit/gather/tr_html_unittest.py    | 46 ++++++++--------
+ tools/grit/grit/gather/txt_unittest.py        | 12 ++---
+ tools/grit/grit/grd_reader_unittest.py        | 40 +++++++-------
+ tools/grit/grit/grit_runner_unittest.py       | 11 ++--
+ tools/grit/grit/node/base.py                  | 54 ++++++++-----------
+ tools/grit/grit/node/base_unittest.py         | 11 ++--
+ tools/grit/grit/node/message.py               |  8 +--
+ tools/grit/grit/node/misc.py                  |  6 +--
+ tools/grit/grit/node/misc_unittest.py         | 45 ++++++++--------
+ tools/grit/grit/node/node_io_unittest.py      | 19 +++----
+ tools/grit/grit/pseudolocales_unittest.py     |  8 +--
+ tools/grit/grit/shortcuts_unittest.py         | 12 ++---
+ tools/grit/grit/tclib_unittest.py             | 16 +++---
+ tools/grit/grit/tool/buildinfo_unittest.py    |  7 +--
+ tools/grit/grit/util.py                       | 20 +++----
+ 30 files changed, 243 insertions(+), 327 deletions(-)
+
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/c_format.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/c_format.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/c_format.py
+@@ -5,14 +5,10 @@
+ """Formats as a .C file for compilation.
+ """
+ 
+-from __future__ import print_function
+-
+ import codecs
+ import os
+ import re
+ 
+-import six
+-
+ from grit import util
+ 
+ 
+@@ -37,7 +33,7 @@ def _FormatHeader(root, output_dir):
+ def Format(root, lang='en', output_dir='.'):
+   """Outputs a C switch statement representing the string table."""
+   from grit.node import message
+-  assert isinstance(lang, six.string_types)
++  assert isinstance(lang, str)
+ 
+   yield _FormatHeader(root, output_dir)
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/c_format_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/c_format_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/c_format_unittest.py
+@@ -6,16 +6,13 @@
+ """Unittest for c_format.py.
+ """
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit import util
+ from grit.tool import build
+@@ -41,7 +38,7 @@ Statement.  Two all.  Game point.
+     </messages>
+       """)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('c_format', 'en'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+     self.assertEqual(u"""\
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/chrome_messages_json_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/chrome_messages_json_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/chrome_messages_json_unittest.py
+@@ -6,17 +6,14 @@
+ """Unittest for chrome_messages_json.py.
+ """
+ 
+-from __future__ import print_function
+-
++import io
+ import json
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit import grd_reader
+ from grit import util
+@@ -61,7 +58,7 @@ class ChromeMessagesJsonFormatUnittest(u
+     </messages>
+     """)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('chrome_messages_json', 'en'),
+                                 buf)
+     output = buf.getvalue()
+@@ -115,7 +112,7 @@ class ChromeMessagesJsonFormatUnittest(u
+       </messages>
+     """)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('chrome_messages_json', 'fr'),
+                                 buf)
+     output = buf.getvalue()
+@@ -143,9 +140,9 @@ class ChromeMessagesJsonFormatUnittest(u
+     </messages>
+   </release>
+ </grit>"""
+-    root = grd_reader.Parse(StringIO(grd), dir=".")
++    root = grd_reader.Parse(io.StringIO(grd), dir=".")
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('chrome_messages_json', 'fr'),
+                                 buf)
+     output = buf.getvalue()
+@@ -161,7 +158,7 @@ class ChromeMessagesJsonFormatUnittest(u
+     </messages>
+     """)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('chrome_messages_json', 'en'),
+                                 buf)
+     output = buf.getvalue()
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/data_pack.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/data_pack.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/data_pack.py
+@@ -7,17 +7,14 @@
+ files.
+ """
+ 
+-from __future__ import print_function
+-
+ import collections
+ import os
+ import struct
+ import sys
++
+ if __name__ == '__main__':
+   sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+-import six
+-
+ from grit import util
+ from grit.node import include
+ from grit.node import message
+@@ -180,7 +177,7 @@ def WriteDataPackToString(resources, enc
+     if resource_id in alias_map:
+       continue
+     data = resources[resource_id]
+-    if isinstance(data, six.text_type):
++    if isinstance(data, str):
+       data = data.encode('utf-8')
+     index_by_id[resource_id] = index
+     ret.append(struct.pack('<HI', resource_id, data_offset))
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/gen_predetermined_ids_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/gen_predetermined_ids_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/gen_predetermined_ids_unittest.py
+@@ -5,16 +5,13 @@
+ 
+ '''Unit tests for the gen_predetermined_ids module.'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.format import gen_predetermined_ids
+ 
+@@ -27,7 +24,7 @@ class GenPredeterminedIdsUnittest(unitte
+     self.assertEqual({101: 'C', 102: 'B', 103: 'E'}, mapping)
+ 
+   def testReadResourceIdsFromFile(self):
+-    f = StringIO('''
++    f = io.StringIO('''
+ // This file is automatically generated by GRIT. Do not edit.
+ 
+ #pragma once
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/minifier.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/minifier.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/minifier.py
+@@ -3,14 +3,10 @@
+ # found in the LICENSE file.
+ """Framework for stripping whitespace and comments from resource files"""
+ 
+-from __future__ import print_function
+-
+ from os import path
+ import subprocess
+ import sys
+ 
+-import six
+-
+ __js_minifier = None
+ __css_minifier = None
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/rc.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/rc.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/rc.py
+@@ -5,14 +5,10 @@
+ '''Support for formatting an RC file for compilation.
+ '''
+ 
+-from __future__ import print_function
+-
+ import os
+ import re
+ from functools import partial
+ 
+-import six
+-
+ from grit import util
+ from grit.node import misc
+ 
+@@ -322,7 +318,7 @@ def RcSubstitutions(substituter, lang):
+ 
+ def _FormatHeader(root, lang, output_dir):
+   '''Returns the required preamble for RC files.'''
+-  assert isinstance(lang, six.string_types)
++  assert isinstance(lang, str)
+   assert isinstance(root, misc.GritNode)
+   # Find the location of the resource header file, so that we can include
+   # it.
+@@ -380,7 +376,7 @@ def FormatMessage(item, lang):
+ 
+ def _FormatSection(item, lang, output_dir):
+   '''Writes out an .rc file section.'''
+-  assert isinstance(lang, six.string_types)
++  assert isinstance(lang, str)
+   from grit.node import structure
+   assert isinstance(item, structure.StructureNode)
+ 
+@@ -409,7 +405,7 @@ def FormatInclude(item, lang, output_dir
+           StructureNode)
+     process_html: False/True (ignored unless item is a StructureNode)
+   '''
+-  assert isinstance(lang, six.string_types)
++  assert isinstance(lang, str)
+   from grit.node import structure
+   from grit.node import include
+   assert isinstance(item, (structure.StructureNode, include.IncludeNode))
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/rc_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/format/rc_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/format/rc_unittest.py
+@@ -5,18 +5,15 @@
+ 
+ '''Unit tests for grit.format.rc'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import re
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import tempfile
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit import grd_reader
+ from grit import util
+@@ -69,7 +66,7 @@ Sting sting
+       </messages>
+       """)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+     self.assertEqual(_PREAMBLE + u'''\
+@@ -91,7 +88,7 @@ END''', output)
+     root.SetOutputLanguage('en')
+     root.RunGatherers()
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+     expected = _PREAMBLE + u'''\
+@@ -168,7 +165,7 @@ END'''.strip()
+       </structures>''', base_dir = '/temp')
+     # We do not run gatherers as it is not needed and wouldn't find the file
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+     expected = (_PREAMBLE +
+@@ -187,7 +184,7 @@ END'''.strip()
+         <include type="TXT" name="TEXT_TWO" file="bingo2.txt"  filenameonly="true" />
+       </includes>''', base_dir = '/temp')
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+     expected = (_PREAMBLE +
+@@ -207,7 +204,7 @@ END'''.strip()
+         <include name="HTML_FILE1" flattenhtml="true" file="%s" type="BINDATA" />
+       </includes>''' % input_file)
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en', output_file),
+                                 buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+@@ -274,7 +271,7 @@ END'''.strip()
+     root.SetOutputLanguage('en')
+     root.RunGatherers()
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en', output_file),
+                                 buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+@@ -294,7 +291,8 @@ END'''.strip()
+ 
+   def testSubstitutionHtml(self):
+     input_file = util.PathFromRoot('grit/testdata/toolbar_about.html')
+-    root = grd_reader.Parse(StringIO('''<?xml version="1.0" encoding="UTF-8"?>
++    root = grd_reader.Parse(
++        io.StringIO('''<?xml version="1.0" encoding="UTF-8"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="1" allow_pseudo="False">
+           <structures fallback_to_english="True">
+@@ -327,7 +325,7 @@ END'''.strip()
+     root.SetOutputLanguage('en')
+     root.RunGatherers()
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     formatter = build.RcBuilder.ProcessNode(
+         root, DummyOutput('rc_all', 'bingobongo'), buf)
+     output = util.StripBlankLinesAndComments(buf.getvalue())
+@@ -348,7 +346,8 @@ END''', output)
+ 
+ 
+   def testSubstitutionRc(self):
+-    root = grd_reader.Parse(StringIO(r'''<?xml version="1.0" encoding="UTF-8"?>
++    root = grd_reader.Parse(
++        io.StringIO(r'''<?xml version="1.0" encoding="UTF-8"?>
+     <grit latest_public_release="2" source_lang_id="en-US" current_release="3"
+           base_dir=".">
+       <outputs>
+@@ -371,7 +370,7 @@ END''', output)
+     root.SetOutputLanguage('en')
+     root.RunGatherers()
+ 
+-    buf = StringIO()
++    buf = io.StringIO()
+     build.RcBuilder.ProcessNode(root, DummyOutput('rc_all', 'en'), buf)
+     output = buf.getvalue()
+     self.assertEqual('''
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/admin_template_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/admin_template_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/admin_template_unittest.py
+@@ -5,16 +5,13 @@
+ 
+ '''Unit tests for the admin template gatherer.'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.gather import admin_template
+ from grit import util
+@@ -25,12 +22,12 @@ from grit.tool import build
+ 
+ class AdmGathererUnittest(unittest.TestCase):
+   def testParsingAndTranslating(self):
+-    pseudofile = StringIO(
+-      'bingo bongo\n'
+-      'ding dong\n'
+-      '[strings] \n'
+-      'whatcha="bingo bongo"\n'
+-      'gotcha = "bingolabongola "the wise" fingulafongula" \n')
++    pseudofile = io.StringIO(
++        'bingo bongo\n'
++        'ding dong\n'
++        '[strings] \n'
++        'whatcha="bingo bongo"\n'
++        'gotcha = "bingolabongola "the wise" fingulafongula" \n')
+     gatherer = admin_template.AdmGatherer(pseudofile)
+     gatherer.Parse()
+     self.failUnless(len(gatherer.GetCliques()) == 2)
+@@ -41,11 +38,11 @@ class AdmGathererUnittest(unittest.TestC
+     self.failUnless(translation == gatherer.GetText().strip())
+ 
+   def testErrorHandling(self):
+-    pseudofile = StringIO(
+-      'bingo bongo\n'
+-      'ding dong\n'
+-      'whatcha="bingo bongo"\n'
+-      'gotcha = "bingolabongola "the wise" fingulafongula" \n')
++    pseudofile = io.StringIO(
++        'bingo bongo\n'
++        'ding dong\n'
++        'whatcha="bingo bongo"\n'
++        'gotcha = "bingolabongola "the wise" fingulafongula" \n')
+     gatherer = admin_template.AdmGatherer(pseudofile)
+     self.assertRaises(admin_template.MalformedAdminTemplateException,
+                       gatherer.Parse)
+@@ -73,7 +70,8 @@ class AdmGathererUnittest(unittest.TestC
+     self.VerifyCliquesFromAdmFile(cliques)
+ 
+   def MakeGrd(self):
+-    grd = grd_reader.Parse(StringIO('''<?xml version="1.0" encoding="UTF-8"?>
++    grd = grd_reader.Parse(
++        io.StringIO('''<?xml version="1.0" encoding="UTF-8"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3">
+         <release seq="3">
+           <structures>
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/interface.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/interface.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/interface.py
+@@ -5,12 +5,8 @@
+ '''Interface for all gatherers.
+ '''
+ 
+-from __future__ import print_function
+-
+ import os.path
+ 
+-import six
+-
+ from grit import clique
+ from grit import util
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/policy_json.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/policy_json.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/policy_json.py
+@@ -84,8 +84,8 @@ class PolicyJson(skeleton_gatherer.Skele
+     try:
+       node = minidom.parseString(xml).childNodes[0]
+     except ExpatError:
+-      reason = '''Input isn't valid XML (has < & > been escaped?): ''' + string
+-      six.reraise(Exception, reason, sys.exc_info()[2])
++      raise Exception('''Input isn't valid XML (has < & > been escaped?): ''' +
++                      string)
+ 
+     for child in node.childNodes:
+       if child.nodeType == minidom.Node.TEXT_NODE:
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/policy_json_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/policy_json_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/policy_json_unittest.py
+@@ -5,18 +5,15 @@
+ 
+ '''Unit tests for grit.gather.policy_json'''
+ 
+-from __future__ import print_function
+-
++import io
+ import json
+ import os
+ import re
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.gather import policy_json
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/rc_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/rc_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/rc_unittest.py
+@@ -5,16 +5,13 @@
+ 
+ '''Unit tests for grit.gather.rc'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.gather import rc
+ from grit import util
+@@ -42,7 +39,7 @@ BEGIN
+ END
+ ''' % self.part_we_want
+ 
+-    f = StringIO(buf)
++    f = io.StringIO(buf)
+ 
+     out = rc.Section(f, 'IDC_KLONKACC')
+     out.ReadSection()
+@@ -59,7 +56,8 @@ END
+ 
+ 
+   def testDialog(self):
+-    dlg = rc.Dialog(StringIO('''IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
++    dlg = rc.Dialog(
++        io.StringIO('''IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
+ STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+ CAPTION "About"
+ FONT 8, "System", 0, 0, 0x0
+@@ -86,7 +84,8 @@ END
+     self.failUnless(transl.strip() == dlg.GetText().strip())
+ 
+   def testAlternateSkeleton(self):
+-    dlg = rc.Dialog(StringIO('''IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
++    dlg = rc.Dialog(
++        io.StringIO('''IDD_ABOUTBOX DIALOGEX 22, 17, 230, 75
+ STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+ CAPTION "About"
+ FONT 8, "System", 0, 0, 0x0
+@@ -97,7 +96,8 @@ END
+ '''), 'IDD_ABOUTBOX')
+     dlg.Parse()
+ 
+-    alt_dlg = rc.Dialog(StringIO('''IDD_ABOUTBOX DIALOGEX 040704, 17, 230, 75
++    alt_dlg = rc.Dialog(
++        io.StringIO('''IDD_ABOUTBOX DIALOGEX 040704, 17, 230, 75
+ STYLE DS_SETFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU
+ CAPTION "XXXXXXXXX"
+ FONT 8, "System", 0, 0, 0x0
+@@ -114,7 +114,8 @@ END
+     self.failUnless(transl.count('Yipee skippy'))
+ 
+   def testMenu(self):
+-    menu = rc.Menu(StringIO('''IDC_KLONK MENU
++    menu = rc.Menu(
++        io.StringIO('''IDC_KLONK MENU
+ BEGIN
+     POPUP "&File """
+     BEGIN
+@@ -143,7 +144,8 @@ END'''), 'IDC_KLONK')
+     self.failUnless(transl.strip() == menu.GetText().strip())
+ 
+   def testVersion(self):
+-    version = rc.Version(StringIO('''
++    version = rc.Version(
++        io.StringIO('''
+ VS_VERSION_INFO VERSIONINFO
+  FILEVERSION 1,0,0,1
+  PRODUCTVERSION 1,0,0,1
+@@ -186,7 +188,8 @@ END
+ 
+ 
+   def testRegressionDialogBox(self):
+-    dialog = rc.Dialog(StringIO('''
++    dialog = rc.Dialog(
++        io.StringIO('''
+ IDD_SIDEBAR_WEATHER_PANEL_PROPPAGE DIALOGEX 0, 0, 205, 157
+ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+ FONT 8, "MS Shell Dlg", 400, 0, 0x1
+@@ -210,7 +213,8 @@ END'''.strip()), 'IDD_SIDEBAR_WEATHER_PA
+ 
+ 
+   def testRegressionDialogBox2(self):
+-    dialog = rc.Dialog(StringIO('''
++    dialog = rc.Dialog(
++        io.StringIO('''
+ IDD_SIDEBAR_EMAIL_PANEL_PROPPAGE DIALOG DISCARDABLE 0, 0, 264, 220
+ STYLE WS_CHILD
+ FONT 8, "MS Shell Dlg"
+@@ -230,7 +234,8 @@ END'''.strip()), 'IDD_SIDEBAR_EMAIL_PANE
+ 
+ 
+   def testRegressionMenuId(self):
+-    menu = rc.Menu(StringIO('''
++    menu = rc.Menu(
++        io.StringIO('''
+ IDR_HYPERMENU_FOLDER MENU
+ BEGIN
+     POPUP "HyperFolder"
+@@ -242,7 +247,8 @@ END'''.strip()), 'IDR_HYPERMENU_FOLDER')
+     self.failUnless(len(menu.GetTextualIds()) == 2)
+ 
+   def testRegressionNewlines(self):
+-    menu = rc.Menu(StringIO('''
++    menu = rc.Menu(
++        io.StringIO('''
+ IDR_HYPERMENU_FOLDER MENU
+ BEGIN
+     POPUP "Hyper\\nFolder"
+@@ -256,7 +262,8 @@ END'''.strip()), 'IDR_HYPERMENU_FOLDER')
+     self.failUnless(transl.find('\\\\n') == -1)
+ 
+   def testRegressionTabs(self):
+-    menu = rc.Menu(StringIO('''
++    menu = rc.Menu(
++        io.StringIO('''
+ IDR_HYPERMENU_FOLDER MENU
+ BEGIN
+     POPUP "Hyper\\tFolder"
+@@ -282,7 +289,8 @@ END'''.strip()), 'IDR_HYPERMENU_FOLDER')
+     self.failUnless(unescaped == '..\\..\\trs\\res\\nav_first.gif')
+ 
+   def testRegressionDialogItemsTextOnly(self):
+-    dialog = rc.Dialog(StringIO('''IDD_OPTIONS_SEARCH DIALOGEX 0, 0, 280, 292
++    dialog = rc.Dialog(
++        io.StringIO('''IDD_OPTIONS_SEARCH DIALOGEX 0, 0, 280, 292
+ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
+     WS_DISABLED | WS_CAPTION | WS_SYSMENU
+ CAPTION "Search"
+@@ -303,7 +311,8 @@ END'''), 'IDD_OPTIONS_SEARCH')
+     self.failUnless('Use Google site:' in translateables)
+ 
+   def testAccelerators(self):
+-    acc = rc.Accelerators(StringIO('''\
++    acc = rc.Accelerators(
++        io.StringIO('''\
+ IDR_ACCELERATOR1 ACCELERATORS
+ BEGIN
+     "^C",           ID_ACCELERATOR32770,    ASCII,  NOINVERT
+@@ -320,7 +329,8 @@ END
+ 
+ 
+   def testRegressionEmptyString(self):
+-    dlg = rc.Dialog(StringIO('''\
++    dlg = rc.Dialog(
++        io.StringIO('''\
+ IDD_CONFIRM_QUIT_GD_DLG DIALOGEX 0, 0, 267, 108
+ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
+     WS_CAPTION
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/skeleton_gatherer.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/skeleton_gatherer.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/skeleton_gatherer.py
+@@ -6,10 +6,6 @@
+ list.
+ '''
+ 
+-from __future__ import print_function
+-
+-import six
+-
+ from grit.gather import interface
+ from grit import clique
+ from grit import exception
+@@ -78,17 +74,16 @@ class SkeletonGatherer(interface.Gathere
+ 
+     out = []
+     for ix in range(len(self.skeleton_)):
+-      if isinstance(self.skeleton_[ix], six.string_types):
++      if isinstance(self.skeleton_[ix], str):
+         if skeleton_gatherer:
+           # Make sure the skeleton is like the original
+-          assert(isinstance(skeleton_gatherer.skeleton_[ix], six.string_types))
++          assert (isinstance(skeleton_gatherer.skeleton_[ix], str))
+           out.append(skeleton_gatherer.skeleton_[ix])
+         else:
+           out.append(self.skeleton_[ix])
+       else:
+         if skeleton_gatherer:  # Make sure the skeleton is like the original
+-          assert(not isinstance(skeleton_gatherer.skeleton_[ix],
+-                                six.string_types))
++          assert (not isinstance(skeleton_gatherer.skeleton_[ix], str))
+         msg = self.skeleton_[ix].MessageForLanguage(lang,
+                                                     pseudo_if_not_available,
+                                                     fallback_to_english)
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/tr_html.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/tr_html.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/tr_html.py
+@@ -49,12 +49,8 @@ This implementation borrows some code, c
+ extern.tclib.api.handlers.html.TCHTMLParser.
+ '''
+ 
+-from __future__ import print_function
+-
+ import re
+ 
+-import six
+-
+ from grit import clique
+ from grit import exception
+ from grit import lazy_re
+@@ -571,7 +567,7 @@ def HtmlToMessage(html, include_block_ta
+       current += m.end()
+       continue
+ 
+-    if len(parts) and isinstance(parts[-1], six.string_types):
++    if len(parts) and isinstance(parts[-1], str):
+       parts[-1] += html[current]
+     else:
+       parts.append(html[current])
+@@ -592,7 +588,7 @@ def HtmlToMessage(html, include_block_ta
+                       description=description)
+   content = msg.GetContent()
+   for ix in range(len(content)):
+-    if isinstance(content[ix], six.string_types):
++    if isinstance(content[ix], str):
+       content[ix] = util.UnescapeHtml(content[ix], replace_nbsp=False)
+ 
+   return msg
+@@ -656,7 +652,7 @@ class TrHtml(interface.GathererBase):
+ 
+     out = []
+     for item in self.skeleton_:
+-      if isinstance(item, six.string_types):
++      if isinstance(item, str):
+         out.append(item)
+       else:
+         msg = item.MessageForLanguage(lang,
+@@ -716,8 +712,8 @@ class TrHtml(interface.GathererBase):
+       if isinstance(self.skeleton_[ix], clique.MessageClique):
+         msg = self.skeleton_[ix].GetMessage()
+         for item in msg.GetContent():
+-          if (isinstance(item, six.string_types)
+-              and _NON_WHITESPACE.search(item) and item != '&nbsp;'):
++          if (isinstance(item, str) and _NON_WHITESPACE.search(item)
++              and item != '&nbsp;'):
+             got_text = True
+             break
+         if not got_text:
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/tr_html_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/tr_html_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/tr_html_unittest.py
+@@ -5,17 +5,13 @@
+ 
+ '''Unit tests for grit.gather.tr_html'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-import six
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.gather import tr_html
+ from grit import clique
+@@ -264,7 +260,7 @@ and BEGIN_LINK_2Privacy FAQEND_LINK_2 on
+ 
+ class TrHtmlUnittest(unittest.TestCase):
+   def testSetAttributes(self):
+-    html = tr_html.TrHtml(StringIO(''))
++    html = tr_html.TrHtml(io.StringIO(''))
+     self.failUnlessEqual(html.fold_whitespace_, False)
+     html.SetAttributes({})
+     self.failUnlessEqual(html.fold_whitespace_, False)
+@@ -276,19 +272,20 @@ class TrHtmlUnittest(unittest.TestCase):
+   def testFoldWhitespace(self):
+     text = '<td>   Test     Message   </td>'
+ 
+-    html = tr_html.TrHtml(StringIO(text))
++    html = tr_html.TrHtml(io.StringIO(text))
+     html.Parse()
+     self.failUnlessEqual(html.skeleton_[1].GetMessage().GetPresentableContent(),
+                          'Test  Message')
+ 
+-    html = tr_html.TrHtml(StringIO(text))
++    html = tr_html.TrHtml(io.StringIO(text))
+     html.fold_whitespace_ = True
+     html.Parse()
+     self.failUnlessEqual(html.skeleton_[1].GetMessage().GetPresentableContent(),
+                          'Test Message')
+ 
+   def testTable(self):
+-    html = tr_html.TrHtml(StringIO('''<table class="shaded-header"><tr>
++    html = tr_html.TrHtml(
++        io.StringIO('''<table class="shaded-header"><tr>
+ <td class="header-element b expand">Preferences</td>
+ <td class="header-element s">
+ <a href="http://desktop.google.com/preferences.html">Preferences&nbsp;Help</a>
+@@ -299,7 +296,8 @@ class TrHtmlUnittest(unittest.TestCase):
+                     'BEGIN_LINKPreferences&nbsp;HelpEND_LINK')
+ 
+   def testSubmitAttribute(self):
+-    html = tr_html.TrHtml(StringIO('''</td>
++    html = tr_html.TrHtml(
++        io.StringIO('''</td>
+ <td class="header-element"><input type=submit value="Save Preferences"
+ name=submit2></td>
+ </tr></table>'''))
+@@ -312,13 +310,14 @@ name=submit2></td>
+     of a translateable section the inline tag will be included.
+     '''
+     html = tr_html.TrHtml(
+-        StringIO('''<label for=DISPLAYNONE><font size=-1> Hello</font>'''))
++        io.StringIO('''<label for=DISPLAYNONE><font size=-1> Hello</font>'''))
+     html.Parse()
+     self.failUnless(html.skeleton_[1].GetMessage().GetRealContent() ==
+                     '<font size=-1> Hello</font>')
+ 
+   def testSillyHeader(self):
+-    html = tr_html.TrHtml(StringIO('''[!]
++    html = tr_html.TrHtml(
++        io.StringIO('''[!]
+ title\tHello
+ bingo
+ bongo
+@@ -336,16 +335,16 @@ bla
+ 
+   def testExplicitDescriptions(self):
+     html = tr_html.TrHtml(
+-        StringIO('Hello [USER]<br/><!-- desc=explicit -->'
+-                          '<input type="button">Go!</input>'))
++        io.StringIO('Hello [USER]<br/><!-- desc=explicit -->'
++                    '<input type="button">Go!</input>'))
+     html.Parse()
+     msg = html.GetCliques()[1].GetMessage()
+     self.failUnlessEqual(msg.GetDescription(), 'explicit')
+     self.failUnlessEqual(msg.GetRealContent(), 'Go!')
+ 
+     html = tr_html.TrHtml(
+-        StringIO('Hello [USER]<br/><!-- desc=explicit\nmultiline -->'
+-                          '<input type="button">Go!</input>'))
++        io.StringIO('Hello [USER]<br/><!-- desc=explicit\nmultiline -->'
++                    '<input type="button">Go!</input>'))
+     html.Parse()
+     msg = html.GetCliques()[1].GetMessage()
+     self.failUnlessEqual(msg.GetDescription(), 'explicit multiline')
+@@ -369,7 +368,7 @@ bla
+     # For manual results inspection only...
+     list = []
+     for item in html.skeleton_:
+-      if isinstance(item, six.string_types):
++      if isinstance(item, str):
+         list.append(item)
+       else:
+         list.append(item.GetMessage().GetPresentableContent())
+@@ -446,7 +445,8 @@ bla
+     # character itself.  So for this test we choose some relatively complex
+     # HTML without character entities (but with &nbsp; because that's handled
+     # specially).
+-    html = tr_html.TrHtml(StringIO('''  <script>
++    html = tr_html.TrHtml(
++        io.StringIO('''  <script>
+       <!--
+       function checkOffice() { var w = document.getElementById("h7");
+       var e = document.getElementById("h8"); var o = document.getElementById("h10");
+@@ -516,8 +516,10 @@ bla
+ 
+   def testRegressionCpuHang(self):
+     # If this regression occurs, the unit test will never return
+-    html = tr_html.TrHtml(StringIO(
+-      '''<input type=text size=12 id=advFileTypeEntry [~SHOW-FILETYPE-BOX~] value="[EXT]" name=ext>'''))
++    html = tr_html.TrHtml(
++        io.StringIO(
++            '''<input type=text size=12 id=advFileTypeEntry [~SHOW-FILETYPE-BOX~] value="[EXT]" name=ext>'''
++        ))
+     html.Parse()
+ 
+ if __name__ == '__main__':
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/txt_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/gather/txt_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/gather/txt_unittest.py
+@@ -5,24 +5,20 @@
+ 
+ '''Unit tests for TxtFile gatherer'''
+ 
+-from __future__ import print_function
+-
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+-
+ import unittest
++import io
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit.gather import txt
+ 
+ 
+ class TxtUnittest(unittest.TestCase):
+   def testGather(self):
+-    input = StringIO('Hello there\nHow are you?')
++    input = io.StringIO('Hello there\nHow are you?')
+     gatherer = txt.TxtFile(input)
+     gatherer.Parse()
+     self.failUnless(gatherer.GetText() == input.getvalue())
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/grd_reader_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/grd_reader_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/grd_reader_unittest.py
+@@ -5,17 +5,13 @@
+ 
+ '''Unit tests for grd_reader package'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+-
+ import unittest
+ 
+-import six
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+ 
+ from grit import exception
+ from grit import grd_reader
+@@ -54,9 +50,9 @@ class GrdReaderUnittest(unittest.TestCas
+     <output filename="resource.rc" lang="en-US" type="rc_all" />
+   </outputs>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     tree = grd_reader.Parse(pseudo_file, '.')
+-    output = six.text_type(tree)
++    output = str(tree)
+     expected_output = input.replace(u' base_dir="."', u'')
+     self.assertEqual(expected_output, output)
+     self.failUnless(tree.GetNodeById('IDS_GREETING'))
+@@ -75,7 +71,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </includes>
+   </release>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     tree = grd_reader.Parse(pseudo_file, '.', stop_after='outputs')
+     # only an <outputs> child
+     self.failUnless(len(tree.children) == 1)
+@@ -94,7 +90,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </messages>
+   </release>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     tree = grd_reader.Parse(pseudo_file, '.')
+ 
+     greeting = tree.GetNodeById('IDS_GREETING')
+@@ -114,7 +110,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </messages>
+   </release>
+ </grit>''' % first_ids_path
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     grit_root_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                                  '..')
+     fake_input_path = os.path.join(
+@@ -151,7 +147,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </messages>
+   </release>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     grit_root_dir = os.path.join(os.path.abspath(os.path.dirname(__file__)),
+                                  '..')
+     fake_input_path = os.path.join(grit_root_dir, "grit/testdata/test.grd")
+@@ -178,7 +174,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </messages>
+   </release>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     root = grd_reader.Parse(pseudo_file, '.', defines={'hello': '1'})
+ 
+     # Check if the ID is set to the name. In the past, there was a bug
+@@ -206,7 +202,7 @@ class GrdReaderUnittest(unittest.TestCas
+     </messages>
+   </release>
+ </grit>'''
+-    pseudo_file = StringIO(input)
++    pseudo_file = io.StringIO(input)
+     root = grd_reader.Parse(pseudo_file, '.', defines={'hello': '1'})
+ 
+     # Check if the ID is set to the name. In the past, there was a bug
+@@ -274,8 +270,7 @@ class GrdReaderUnittest(unittest.TestCas
+ 
+     with util.TempDir({'sub.grp': sub_grd,
+                        'subsub.grp': subsub_grd}) as tmp_sub_dir:
+-      output = grd_reader.Parse(StringIO(top_grd),
+-                                tmp_sub_dir.GetPath())
++      output = grd_reader.Parse(io.StringIO(top_grd), tmp_sub_dir.GetPath())
+       correct_sources = {
+         'IDS_TEST': None,
+         'IDS_TEST2': tmp_sub_dir.GetPath('sub.grp'),
+@@ -306,7 +301,7 @@ class GrdReaderUnittest(unittest.TestCas
+         (exception.FileNotFound, u'<part file="yet_created_x" />'),
+     ]
+     for raises, data in part_failures:
+-      data = StringIO(template % data)
++      data = io.StringIO(template % data)
+       self.assertRaises(raises, grd_reader.Parse, data, '.')
+ 
+     gritpart_failures = [
+@@ -314,7 +309,7 @@ class GrdReaderUnittest(unittest.TestCas
+         (exception.MissingElement, u'<output filename="x" type="y" />'),
+     ]
+     for raises, data in gritpart_failures:
+-      top_grd = StringIO(template % u'<part file="bad.grp" />')
++      top_grd = io.StringIO(template % u'<part file="bad.grp" />')
+       with util.TempDir({'bad.grp': data}) as temp_dir:
+         self.assertRaises(raises, grd_reader.Parse, top_grd, temp_dir.GetPath())
+ 
+@@ -338,7 +333,8 @@ class GrdReaderUnittest(unittest.TestCas
+         </release>
+       </grit>''' % sys.platform
+     with util.TempDir({}) as temp_dir:
+-      grd_reader.Parse(StringIO(grd_text), temp_dir.GetPath(),
++      grd_reader.Parse(io.StringIO(grd_text),
++                       temp_dir.GetPath(),
+                        target_platform='android')
+ 
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/grit_runner_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/grit_runner_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/grit_runner_unittest.py
+@@ -5,23 +5,20 @@
+ 
+ '''Unit tests for grit.py'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+ 
+ from grit import util
+ import grit.grit_runner
+ 
+ class OptionArgsUnittest(unittest.TestCase):
+   def setUp(self):
+-    self.buf = StringIO()
++    self.buf = io.StringIO()
+     self.old_stdout = sys.stdout
+     sys.stdout = self.buf
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/base.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/base.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/base.py
+@@ -5,16 +5,12 @@
+ '''Base types for nodes in a GRIT resource tree.
+ '''
+ 
+-from __future__ import print_function
+-
+ import ast
+ import os
+ import struct
+ import sys
+ from xml.sax import saxutils
+ 
+-import six
+-
+ from grit import constants
+ from grit import clique
+ from grit import exception
+@@ -67,7 +63,7 @@ class Node(object):
+ 
+   def __exit__(self, exc_type, exc_value, traceback):
+     if exc_type is not None:
+-      print(u'Error processing node %s: %s' % (six.text_type(self), exc_value))
++      print(u'Error processing node %s: %s' % (str(self), exc_value))
+ 
+   def __iter__(self):
+     '''A preorder iteration through the tree that this node is the root of.'''
+@@ -120,7 +116,7 @@ class Node(object):
+       name: u'elementname'
+       parent: grit.node.base.Node or subclass or None
+     '''
+-    assert isinstance(name, six.string_types)
++    assert isinstance(name, str)
+     assert not parent or isinstance(parent, Node)
+     self.name = name
+     self.parent = parent
+@@ -163,7 +159,7 @@ class Node(object):
+     Return:
+       None
+     '''
+-    assert isinstance(content, six.string_types)
++    assert isinstance(content, str)
+     if self._ContentType() != self._CONTENT_TYPE_NONE:
+       self.mixed_content.append(content)
+     elif content.strip() != '':
+@@ -180,8 +176,8 @@ class Node(object):
+     Return:
+       None
+     '''
+-    assert isinstance(attrib, six.string_types)
+-    assert isinstance(value, six.string_types)
++    assert isinstance(attrib, str)
++    assert isinstance(value, str)
+     if self._IsValidAttribute(attrib, value):
+       self.attrs[attrib] = value
+     else:
+@@ -192,34 +188,32 @@ class Node(object):
+ 
+     # TODO(joi) Rewrite this, it's extremely ugly!
+     if len(self.mixed_content):
+-      if isinstance(self.mixed_content[0], six.string_types):
++      if isinstance(self.mixed_content[0], str):
+         # Remove leading and trailing chunks of pure whitespace.
+-        while (len(self.mixed_content) and
+-               isinstance(self.mixed_content[0], six.string_types) and
+-               self.mixed_content[0].strip() == ''):
++        while (len(self.mixed_content)
++               and isinstance(self.mixed_content[0], str)
++               and self.mixed_content[0].strip() == ''):
+           self.mixed_content = self.mixed_content[1:]
+         # Strip leading and trailing whitespace from mixed content chunks
+         # at front and back.
+-        if (len(self.mixed_content) and
+-            isinstance(self.mixed_content[0], six.string_types)):
++        if (len(self.mixed_content) and isinstance(self.mixed_content[0], str)):
+           self.mixed_content[0] = self.mixed_content[0].lstrip()
+         # Remove leading and trailing ''' (used to demarcate whitespace)
+-        if (len(self.mixed_content) and
+-            isinstance(self.mixed_content[0], six.string_types)):
++        if (len(self.mixed_content) and isinstance(self.mixed_content[0], str)):
+           if self.mixed_content[0].startswith("'''"):
+             self.mixed_content[0] = self.mixed_content[0][3:]
+     if len(self.mixed_content):
+-      if isinstance(self.mixed_content[-1], six.string_types):
++      if isinstance(self.mixed_content[-1], str):
+         # Same stuff all over again for the tail end.
+-        while (len(self.mixed_content) and
+-               isinstance(self.mixed_content[-1], six.string_types) and
+-               self.mixed_content[-1].strip() == ''):
++        while (len(self.mixed_content)
++               and isinstance(self.mixed_content[-1], str)
++               and self.mixed_content[-1].strip() == ''):
+           self.mixed_content = self.mixed_content[:-1]
+-        if (len(self.mixed_content) and
+-            isinstance(self.mixed_content[-1], six.string_types)):
++        if (len(self.mixed_content)
++            and isinstance(self.mixed_content[-1], str)):
+           self.mixed_content[-1] = self.mixed_content[-1].rstrip()
+-        if (len(self.mixed_content) and
+-            isinstance(self.mixed_content[-1], six.string_types)):
++        if (len(self.mixed_content)
++            and isinstance(self.mixed_content[-1], str)):
+           if self.mixed_content[-1].endswith("'''"):
+             self.mixed_content[-1] = self.mixed_content[-1][:-3]
+ 
+@@ -259,8 +253,7 @@ class Node(object):
+   def GetCdata(self):
+     '''Returns all CDATA of this element, concatenated into a single
+     string.  Note that this ignores any elements embedded in CDATA.'''
+-    return ''.join([c for c in self.mixed_content
+-                    if isinstance(c, six.string_types)])
++    return ''.join([c for c in self.mixed_content if isinstance(c, str)])
+ 
+   def __str__(self):
+     '''Returns this node and all nodes below it as an XML document in a Unicode
+@@ -278,7 +271,7 @@ class Node(object):
+     children and CDATA are layed out in a way that preserves internal
+     whitespace.
+     '''
+-    assert isinstance(indent, six.string_types)
++    assert isinstance(indent, str)
+ 
+     content_one_line = (one_line or
+                         self._ContentType() == self._CONTENT_TYPE_MIXED)
+@@ -313,7 +306,7 @@ class Node(object):
+   def ContentsAsXml(self, indent, one_line):
+     '''Returns the contents of this node (CDATA and child elements) in XML
+     format.  If 'one_line' is true, the content will be laid out on one line.'''
+-    assert isinstance(indent, six.string_types)
++    assert isinstance(indent, str)
+ 
+     # Build the contents of the element.
+     inside_parts = []
+@@ -339,8 +332,7 @@ class Node(object):
+ 
+     # If the last item is a string (not a node) and ends with whitespace,
+     # we need to add the ''' delimiter.
+-    if (isinstance(last_item, six.string_types) and
+-        last_item.rstrip() != last_item):
++    if (isinstance(last_item, str) and last_item.rstrip() != last_item):
+       inside_parts[-1] = inside_parts[-1] + u"'''"
+ 
+     return u''.join(inside_parts)
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/base_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/base_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/base_unittest.py
+@@ -5,16 +5,13 @@
+ 
+ '''Unit tests for base.Node functionality (as used in various subclasses)'''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+ from grit import grd_reader
+ from grit import util
+@@ -186,7 +183,7 @@ class NodeUnittest(unittest.TestCase):
+           </messages>
+         </release>
+       </grit>'''
+-    grd = grd_reader.Parse(StringIO(xml),
++    grd = grd_reader.Parse(io.StringIO(xml),
+                            util.PathFromRoot('grit/test/data'))
+     from grit.node import node_io
+     output_nodes = grd.GetChildrenOfType(node_io.OutputNode)
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/message.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/message.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/message.py
+@@ -5,12 +5,8 @@
+ '''Handling of the <message> element.
+ '''
+ 
+-from __future__ import print_function
+-
+ import re
+ 
+-import six
+-
+ from grit.node import base
+ 
+ from grit import clique
+@@ -170,7 +166,7 @@ class MessageNode(base.ContentNode):
+     placeholders = []
+ 
+     for item in self.mixed_content:
+-      if isinstance(item, six.string_types):
++      if isinstance(item, str):
+         # Not a <ph> element: fail if any <ph> formatters are detected.
+         if _FORMATTERS.search(item):
+           print(_BAD_PLACEHOLDER_MSG % (item, self.source))
+@@ -309,7 +305,7 @@ class MessageNode(base.ContentNode):
+ 
+     items = message.GetContent()
+     for ix, item in enumerate(items):
+-      if isinstance(item, six.string_types):
++      if isinstance(item, str):
+         # Ensure whitespace at front and back of message is correctly handled.
+         if ix == 0:
+           item = "'''" + item
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/misc.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/misc.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/misc.py
+@@ -5,14 +5,10 @@
+ """Miscellaneous node types.
+ """
+ 
+-from __future__ import print_function
+-
+ import os.path
+ import re
+ import sys
+ 
+-import six
+-
+ from grit import constants
+ from grit import exception
+ from grit import util
+@@ -600,7 +596,7 @@ class GritNode(base.Node):
+     assert self._id_map is None, 'AssignFirstIds() after InitializeIds()'
+     # If the input is a stream, then we're probably in a unit test and
+     # should skip this step.
+-    if not isinstance(filename_or_stream, six.string_types):
++    if not isinstance(filename_or_stream, str):
+       return
+ 
+     # Nothing to do if the first_ids_filename attribute isn't set.
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/misc_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/misc_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/misc_unittest.py
+@@ -5,9 +5,8 @@
+ 
+ '''Unit tests for misc.GritNode'''
+ 
+-from __future__ import print_function
+-
+ import contextlib
++import io
+ import os
+ import sys
+ import tempfile
+@@ -16,7 +15,6 @@ import unittest
+ if __name__ == '__main__':
+   sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+-from six import StringIO
+ 
+ from grit import grd_reader
+ import grit.exception
+@@ -104,8 +102,7 @@ class GritNodeUnittest(unittest.TestCase
+         </release>
+       </grit>''' % chrome_html_path
+ 
+-    grd = grd_reader.Parse(StringIO(xml),
+-                           util.PathFromRoot('grit/testdata'))
++    grd = grd_reader.Parse(io.StringIO(xml), util.PathFromRoot('grit/testdata'))
+     expected = ['chrome_html.html', 'default_100_percent/a.png',
+                 'default_100_percent/b.png', 'included_sample.html',
+                 'special_100_percent/a.png']
+@@ -133,7 +130,7 @@ class GritNodeUnittest(unittest.TestCase
+         </release>
+       </grit>''' % chrome_html_path
+ 
+-    grd = grd_reader.Parse(StringIO(xml), util.PathFromRoot('grit/testdata'))
++    grd = grd_reader.Parse(io.StringIO(xml), util.PathFromRoot('grit/testdata'))
+     expected = ['chrome_html.html', 'included_sample.html']
+     actual = [os.path.relpath(path, util.PathFromRoot('grit/testdata')) for
+               path in grd.GetInputFiles()]
+@@ -223,7 +220,7 @@ class GritNodeUnittest(unittest.TestCase
+ 
+ class IfNodeUnittest(unittest.TestCase):
+   def testIffyness(self):
+-    grd = grd_reader.Parse(StringIO('''
++    grd = grd_reader.Parse(io.StringIO('''
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <messages>
+@@ -247,7 +244,8 @@ class IfNodeUnittest(unittest.TestCase):
+             </if>
+           </messages>
+         </release>
+-      </grit>'''), dir='.')
++      </grit>'''),
++                           dir='.')
+ 
+     messages_node = grd.children[0].children[0]
+     bingo_message = messages_node.children[0].children[0]
+@@ -331,7 +329,7 @@ class IfNodeUnittest(unittest.TestCase):
+     self.assertEqual(['IDS_YES1', 'IDS_YES2', 'IDS_YES3', 'IDS_YES4'], included)
+ 
+   def testIffynessWithOutputNodes(self):
+-    grd = grd_reader.Parse(StringIO('''
++    grd = grd_reader.Parse(io.StringIO('''
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <outputs>
+           <output filename="uncond1.rc" type="rc_data" />
+@@ -347,7 +345,8 @@ class IfNodeUnittest(unittest.TestCase):
+             <emit emit_type='prepend'></emit>
+           </output>
+         </outputs>
+-      </grit>'''), dir='.')
++      </grit>'''),
++                           dir='.')
+ 
+     outputs_node = grd.children[0]
+     uncond1_output = outputs_node.children[0]
+@@ -395,7 +394,7 @@ class IfNodeUnittest(unittest.TestCase):
+     self.assertNotEquals(outputs, ['uncond1.rc', 'uncond2.adm', 'iftest.h'])
+ 
+   def testChildrenAccepted(self):
+-    grd_reader.Parse(StringIO(r'''<?xml version="1.0"?>
++    grd_reader.Parse(io.StringIO(r'''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <includes>
+@@ -439,11 +438,12 @@ class IfNodeUnittest(unittest.TestCase):
+             </if>
+           </if>
+         </translations>
+-      </grit>'''), dir='.')
++      </grit>'''),
++                     dir='.')
+ 
+   def testIfBadChildrenNesting(self):
+     # includes
+-    xml = StringIO(r'''<?xml version="1.0"?>
++    xml = io.StringIO(r'''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <includes>
+@@ -455,7 +455,7 @@ class IfNodeUnittest(unittest.TestCase):
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+     # messages
+-    xml = StringIO(r'''<?xml version="1.0"?>
++    xml = io.StringIO(r'''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <messages>
+@@ -467,7 +467,7 @@ class IfNodeUnittest(unittest.TestCase):
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+     # structures
+-    xml = StringIO('''<?xml version="1.0"?>
++    xml = io.StringIO('''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <structures>
+@@ -479,7 +479,7 @@ class IfNodeUnittest(unittest.TestCase):
+       </grit>''')
+     # translations
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+-    xml = StringIO('''<?xml version="1.0"?>
++    xml = io.StringIO('''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <translations>
+           <if expr="'bingo' in defs">
+@@ -489,7 +489,7 @@ class IfNodeUnittest(unittest.TestCase):
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+     # same with nesting
+-    xml = StringIO(r'''<?xml version="1.0"?>
++    xml = io.StringIO(r'''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <includes>
+@@ -502,7 +502,7 @@ class IfNodeUnittest(unittest.TestCase):
+         </release>
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+-    xml = StringIO(r'''<?xml version="1.0"?>
++    xml = io.StringIO(r'''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <messages>
+@@ -515,7 +515,7 @@ class IfNodeUnittest(unittest.TestCase):
+         </release>
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+-    xml = StringIO('''<?xml version="1.0"?>
++    xml = io.StringIO('''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <release seq="3">
+           <structures>
+@@ -528,7 +528,7 @@ class IfNodeUnittest(unittest.TestCase):
+         </release>
+       </grit>''')
+     self.assertRaises(grit.exception.UnexpectedChild, grd_reader.Parse, xml)
+-    xml = StringIO('''<?xml version="1.0"?>
++    xml = io.StringIO('''<?xml version="1.0"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <translations>
+           <if expr="'bingo' in defs">
+@@ -543,7 +543,8 @@ class IfNodeUnittest(unittest.TestCase):
+ 
+ class ReleaseNodeUnittest(unittest.TestCase):
+   def testPseudoControl(self):
+-    grd = grd_reader.Parse(StringIO('''<?xml version="1.0" encoding="UTF-8"?>
++    grd = grd_reader.Parse(
++        io.StringIO('''<?xml version="1.0" encoding="UTF-8"?>
+       <grit latest_public_release="1" source_lang_id="en-US" current_release="2" base_dir=".">
+         <release seq="1" allow_pseudo="false">
+           <messages>
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/node_io_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/node/node_io_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/node/node_io_unittest.py
+@@ -5,17 +5,14 @@
+ 
+ '''Unit tests for node_io.FileNode'''
+ 
+-from __future__ import print_function
+-
+ import os
+ import sys
+ import unittest
++import io
+ 
+ if __name__ == '__main__':
+   sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+-from six import StringIO
+-
+ from grit.node import misc
+ from grit.node import node_io
+ from grit.node import empty
+@@ -69,14 +66,14 @@ class FileNodeUnittest(unittest.TestCase
+           </messages>
+         </release>
+       </grit>'''
+-    grd = grd_reader.Parse(StringIO(xml),
+-                           util.PathFromRoot('grit/testdata'))
++    grd = grd_reader.Parse(io.StringIO(xml), util.PathFromRoot('grit/testdata'))
+     grd.SetOutputLanguage('en')
+     grd.RunGatherers()
+     self.VerifyCliquesContainEnglishAndFrenchAndNothingElse(_GetAllCliques(grd))
+ 
+   def testIffyness(self):
+-    grd = grd_reader.Parse(StringIO('''<?xml version="1.0" encoding="UTF-8"?>
++    grd = grd_reader.Parse(
++        io.StringIO('''<?xml version="1.0" encoding="UTF-8"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <translations>
+           <if expr="lang == 'fr'">
+@@ -121,8 +118,7 @@ class FileNodeUnittest(unittest.TestCase
+           </messages>
+         </release>
+       </grit>'''
+-    grd = grd_reader.Parse(StringIO(xml),
+-                           util.PathFromRoot('grit/testdata'))
++    grd = grd_reader.Parse(io.StringIO(xml), util.PathFromRoot('grit/testdata'))
+     grd.SetOutputLanguage('en')
+     grd.RunGatherers()
+     self.VerifyCliquesContainEnglishAndFrenchAndNothingElse(_GetAllCliques(grd))
+@@ -146,7 +142,7 @@ class FileNodeUnittest(unittest.TestCase
+           </messages>
+         </release>
+       </grit>'''
+-    grd = grd_reader.Parse(StringIO(xml),
++    grd = grd_reader.Parse(io.StringIO(xml),
+                            util.PathFromRoot('grit/test/data'),
+                            defines={})
+     grd.SetOutputLanguage('en')
+@@ -163,7 +159,8 @@ class FileNodeUnittest(unittest.TestCase
+   # Verify that 'iw' and 'no' language codes in xtb files are mapped to 'he' and
+   # 'nb'.
+   def testLangCodeMapping(self):
+-    grd = grd_reader.Parse(StringIO('''<?xml version="1.0" encoding="UTF-8"?>
++    grd = grd_reader.Parse(
++        io.StringIO('''<?xml version="1.0" encoding="UTF-8"?>
+       <grit latest_public_release="2" source_lang_id="en-US" current_release="3" base_dir=".">
+         <translations>
+           <file path="generated_resources_no.xtb" lang="nb" />
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/pseudolocales_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/pseudolocales_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/pseudolocales_unittest.py
+@@ -4,16 +4,12 @@
+ # found in the LICENSE file.
+ '''Unit tests for grit.pseudolocales'''
+ 
+-from __future__ import print_function
+-
+ import sys
+ import os.path
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+-
+ import unittest
+ 
+-import six
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+ 
+ import grit.pseudolocales as pl
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/shortcuts_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/shortcuts_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/shortcuts_unittest.py
+@@ -6,16 +6,13 @@
+ '''Unit tests for grit.shortcuts
+ '''
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+-
+ import unittest
+ 
+-from six import StringIO
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+ 
+ from grit import shortcuts
+ from grit import clique
+@@ -46,7 +43,8 @@ class ShortcutsUnittest(unittest.TestCas
+     self.failUnless(len(warnings) == 0)
+ 
+   def testDialog(self):
+-    dlg = rc.Dialog(StringIO('''\
++    dlg = rc.Dialog(
++        io.StringIO('''\
+ IDD_SIDEBAR_RSS_PANEL_PROPPAGE DIALOGEX 0, 0, 239, 221
+ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+ FONT 8, "MS Shell Dlg", 400, 0, 0x1
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/tclib_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/tclib_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/tclib_unittest.py
+@@ -5,16 +5,12 @@
+ 
+ '''Unit tests for grit.tclib'''
+ 
+-from __future__ import print_function
+-
+ import sys
+ import os.path
+-if __name__ == '__main__':
+-  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+-
+ import unittest
+ 
+-import six
++if __name__ == '__main__':
++  sys.path.append(os.path.join(os.path.dirname(__file__), '..'))
+ 
+ from grit import tclib
+ 
+@@ -27,14 +23,14 @@ class TclibUnittest(unittest.TestCase):
+     msg = tclib.Message(text=u'Hello Earthlings',
+                         description='Greetings\n\t      message')
+     self.failUnlessEqual(msg.GetPresentableContent(), 'Hello Earthlings')
+-    self.failUnless(isinstance(msg.GetPresentableContent(), six.string_types))
++    self.failUnless(isinstance(msg.GetPresentableContent(), str))
+     self.failUnlessEqual(msg.GetDescription(), 'Greetings message')
+ 
+   def testGetAttr(self):
+     msg = tclib.Message()
+     msg.AppendText(u'Hello')  # Tests __getattr__
+     self.failUnless(msg.GetPresentableContent() == 'Hello')
+-    self.failUnless(isinstance(msg.GetPresentableContent(), six.string_types))
++    self.failUnless(isinstance(msg.GetPresentableContent(), str))
+ 
+   def testAll(self):
+     text = u'Howdie USERNAME'
+@@ -44,7 +40,7 @@ class TclibUnittest(unittest.TestCase):
+ 
+     trans = tclib.Translation(text=text, placeholders=phs)
+     self.failUnless(trans.GetPresentableContent() == 'Howdie USERNAME')
+-    self.failUnless(isinstance(trans.GetPresentableContent(), six.string_types))
++    self.failUnless(isinstance(trans.GetPresentableContent(), str))
+ 
+   def testUnicodeReturn(self):
+     text = u'\u00fe'
+@@ -66,7 +62,7 @@ class TclibUnittest(unittest.TestCase):
+     transl = tclib.Translation(text=msg.GetPresentableContent(),
+                                placeholders=msg.GetPlaceholders())
+     content = transl.GetContent()
+-    self.failUnless(isinstance(content[3], six.string_types))
++    self.failUnless(isinstance(content[3], str))
+ 
+   def testFingerprint(self):
+     # This has Windows line endings.  That is on purpose.
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/tool/buildinfo_unittest.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/tool/buildinfo_unittest.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/tool/buildinfo_unittest.py
+@@ -6,8 +6,7 @@
+ """Unit tests for the 'grit buildinfo' tool.
+ """
+ 
+-from __future__ import print_function
+-
++import io
+ import os
+ import sys
+ import unittest
+@@ -16,8 +15,6 @@ import unittest
+ if __name__ == '__main__':
+   sys.path.append(os.path.join(os.path.dirname(__file__), '../..'))
+ 
+-from six import StringIO
+-
+ # pylint: disable-msg=C6204
+ from grit.tool import buildinfo
+ 
+@@ -28,7 +25,7 @@ class BuildInfoUnittest(unittest.TestCas
+     # Change CWD to make tests work independently of callers CWD.
+     os.chdir(os.path.dirname(__file__))
+     os.chdir('..')
+-    self.buf = StringIO()
++    self.buf = io.StringIO()
+     self.old_stdout = sys.stdout
+     sys.stdout = self.buf
+ 
+Index: qt6-webengine/src/3rdparty/chromium/tools/grit/grit/util.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/tools/grit/grit/util.py
++++ qt6-webengine/src/3rdparty/chromium/tools/grit/grit/util.py
+@@ -5,20 +5,16 @@
+ '''Utilities used by GRIT.
+ '''
+ 
+-from __future__ import print_function
+-
+ import codecs
++import html.entities
+ import io
+ import os
+ import re
+ import shutil
+ import sys
+ import tempfile
+-from xml.sax import saxutils
+ 
+-import six
+-from six import StringIO
+-from six.moves import html_entities as entities
++from xml.sax import saxutils
+ 
+ from grit import lazy_re
+ 
+@@ -224,7 +220,7 @@ def WrapOutputStream(stream, encoding =
+ def ChangeStdoutEncoding(encoding = 'utf-8'):
+   '''Changes STDOUT to print characters using the specified encoding.'''
+   # If we're unittesting, don't reconfigure.
+-  if isinstance(sys.stdout, StringIO):
++  if isinstance(sys.stdout, io.StringIO):
+     return
+ 
+   if sys.version_info.major < 3:
+@@ -270,16 +266,16 @@ def UnescapeHtml(text, replace_nbsp=True
+   def Replace(match):
+     groups = match.groupdict()
+     if groups['hex']:
+-      return six.unichr(int(groups['hex'], 16))
++      return chr(int(groups['hex'], 16))
+     elif groups['decimal']:
+-      return six.unichr(int(groups['decimal'], 10))
++      return chr(int(groups['decimal'], 10))
+     else:
+       name = groups['named']
+       if name == 'nbsp' and not replace_nbsp:
+         return match.group()  # Don't replace &nbsp;
+       assert name != None
+-      if name in entities.name2codepoint:
+-        return six.unichr(entities.name2codepoint[name])
++      if name in html.entities.name2codepoint:
++        return chr(html.entities.name2codepoint[name])
+       else:
+         return match.group()  # Unknown HTML character entity - don't replace
+ 
+@@ -347,7 +343,7 @@ def ParseGrdForUnittest(body, base_dir=N
+     base_dir: The base_dir attribute of the <grit> tag.
+   '''
+   from grit import grd_reader
+-  if isinstance(body, six.text_type):
++  if isinstance(body, str):
+     body = body.encode('utf-8')
+   if base_dir is None:
+     base_dir = PathFromRoot('.')
diff --git a/debian/patches/remove_six_moves_from_protobuf.patch b/debian/patches/remove_six_moves_from_protobuf.patch
new file mode 100644
index 0000000..feb7384
--- /dev/null
+++ b/debian/patches/remove_six_moves_from_protobuf.patch
@@ -0,0 +1,313 @@
+Index: qt6-webengine/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py
++++ qt6-webengine/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/internal/python_message.py
+@@ -55,9 +55,6 @@ import struct
+ import sys
+ import weakref
+ 
+-import six
+-from six.moves import range
+-
+ # We use "as" to avoid name collisions with variables.
+ from google.protobuf.internal import api_implementation
+ from google.protobuf.internal import containers
+@@ -284,13 +281,6 @@ def _IsMessageMapField(field):
+   return value_type.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE
+ 
+ 
+-def _IsStrictUtf8Check(field):
+-  if field.containing_type.syntax != 'proto3':
+-    return False
+-  enforce_utf8 = True
+-  return enforce_utf8
+-
+-
+ def _AttachFieldHelpers(cls, field_descriptor):
+   is_repeated = (field_descriptor.label == _FieldDescriptor.LABEL_REPEATED)
+   is_packable = (is_repeated and
+@@ -348,11 +338,10 @@ def _AttachFieldHelpers(cls, field_descr
+           field_descriptor, _GetInitializeDefaultForMap(field_descriptor),
+           is_message_map)
+     elif decode_type == _FieldDescriptor.TYPE_STRING:
+-      is_strict_utf8_check = _IsStrictUtf8Check(field_descriptor)
+       field_decoder = decoder.StringDecoder(
+           field_descriptor.number, is_repeated, is_packed,
+           field_descriptor, field_descriptor._default_constructor,
+-          is_strict_utf8_check, clear_if_default)
++          clear_if_default)
+     elif field_descriptor.cpp_type == _FieldDescriptor.CPPTYPE_MESSAGE:
+       field_decoder = type_checkers.TYPE_TO_DECODER[decode_type](
+           field_descriptor.number, is_repeated, is_packed,
+@@ -485,7 +474,7 @@ def _ReraiseTypeErrorWithFieldName(messa
+     exc = TypeError('%s for field %s.%s' % (str(exc), message_name, field_name))
+ 
+   # re-raise possibly-amended exception with original traceback:
+-  six.reraise(type(exc), exc, sys.exc_info()[2])
++  raise exc.with_traceback(sys.exc_info()[2])
+ 
+ 
+ def _AddInitMethod(message_descriptor, cls):
+@@ -498,7 +487,7 @@ def _AddInitMethod(message_descriptor, c
+     enum_type with the same name.  If the value is not a string, it's
+     returned as-is.  (No conversion or bounds-checking is done.)
+     """
+-    if isinstance(value, six.string_types):
++    if isinstance(value, str):
+       try:
+         return enum_type.values_by_name[value].number
+       except KeyError:
+@@ -1133,12 +1122,6 @@ def _AddSerializePartialToStringMethod(m
+ def _AddMergeFromStringMethod(message_descriptor, cls):
+   """Helper for _AddMessageMethods()."""
+   def MergeFromString(self, serialized):
+-    if isinstance(serialized, memoryview) and six.PY2:
+-      raise TypeError(
+-          'memoryview not supported in Python 2 with the pure Python proto '
+-          'implementation: this is to maintain compatibility with the C++ '
+-          'implementation')
+-
+     serialized = memoryview(serialized)
+     length = len(serialized)
+     try:
+@@ -1311,6 +1294,14 @@ def _AddIsInitializedMethod(message_desc
+   cls.FindInitializationErrors = FindInitializationErrors
+ 
+ 
++def _FullyQualifiedClassName(klass):
++  module = klass.__module__
++  name = getattr(klass, '__qualname__', klass.__name__)
++  if module in (None, 'builtins', '__builtin__'):
++    return name
++  return module + '.' + name
++
++
+ def _AddMergeFromMethod(cls):
+   LABEL_REPEATED = _FieldDescriptor.LABEL_REPEATED
+   CPPTYPE_MESSAGE = _FieldDescriptor.CPPTYPE_MESSAGE
+@@ -1319,7 +1310,8 @@ def _AddMergeFromMethod(cls):
+     if not isinstance(msg, cls):
+       raise TypeError(
+           'Parameter to MergeFrom() must be instance of same class: '
+-          'expected %s got %s.' % (cls.__name__, msg.__class__.__name__))
++          'expected %s got %s.' % (_FullyQualifiedClassName(cls),
++                                   _FullyQualifiedClassName(msg.__class__)))
+ 
+     assert msg is not self
+     self._Modified()
+Index: qt6-webengine/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/text_format.py
+===================================================================
+--- qt6-webengine.orig/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/text_format.py
++++ qt6-webengine/src/3rdparty/chromium/third_party/protobuf/python/google/protobuf/text_format.py
+@@ -48,16 +48,12 @@ import encodings.unicode_escape  # pylin
+ import io
+ import math
+ import re
+-import six
+ 
+ from google.protobuf.internal import decoder
+ from google.protobuf.internal import type_checkers
+ from google.protobuf import descriptor
+ from google.protobuf import text_encoding
+ 
+-if six.PY3:
+-  long = int  # pylint: disable=redefined-builtin,invalid-name
+-
+ # pylint: disable=g-import-not-at-top
+ __all__ = ['MessageToString', 'Parse', 'PrintMessage', 'PrintField',
+            'PrintFieldValue', 'Merge', 'MessageToBytes']
+@@ -102,15 +98,9 @@ class ParseError(Error):
+ class TextWriter(object):
+ 
+   def __init__(self, as_utf8):
+-    if six.PY2:
+-      self._writer = io.BytesIO()
+-    else:
+-      self._writer = io.StringIO()
++    self._writer = io.StringIO()
+ 
+   def write(self, val):
+-    if six.PY2:
+-      if isinstance(val, six.text_type):
+-        val = val.encode('utf-8')
+     return self._writer.write(val)
+ 
+   def close(self):
+@@ -541,7 +531,7 @@ class _Printer(object):
+         # For groups, use the capitalized name.
+         out.write(field.message_type.name)
+       else:
+-        out.write(field.name)
++          out.write(field.name)
+ 
+     if (self.force_colon or
+         field.cpp_type != descriptor.FieldDescriptor.CPPTYPE_MESSAGE):
+@@ -562,13 +552,11 @@ class _Printer(object):
+     # Note: this is called only when value has at least one element.
+     self._PrintFieldName(field)
+     self.out.write(' [')
+-    for i in six.moves.range(len(value) - 1):
++    for i in range(len(value) - 1):
+       self.PrintFieldValue(field, value[i])
+       self.out.write(', ')
+     self.PrintFieldValue(field, value[-1])
+     self.out.write(']')
+-    if self.force_colon:
+-      self.out.write(':')
+     self.out.write(' ' if self.as_one_line else '\n')
+ 
+   def _PrintMessageFieldValue(self, value):
+@@ -610,7 +598,7 @@ class _Printer(object):
+         out.write(str(value))
+     elif field.cpp_type == descriptor.FieldDescriptor.CPPTYPE_STRING:
+       out.write('\"')
+-      if isinstance(value, six.text_type) and (six.PY2 or not self.as_utf8):
++      if isinstance(value, str) and not self.as_utf8:
+         out_value = value.encode('utf-8')
+       else:
+         out_value = value
+@@ -841,12 +829,9 @@ class _Parser(object):
+       ParseError: On text parsing problems.
+     """
+     # Tokenize expects native str lines.
+-    if six.PY2:
+-      str_lines = (line if isinstance(line, str) else line.encode('utf-8')
+-                   for line in lines)
+-    else:
+-      str_lines = (line if isinstance(line, str) else line.decode('utf-8')
+-                   for line in lines)
++    str_lines = (
++        line if isinstance(line, str) else line.decode('utf-8')
++        for line in lines)
+     tokenizer = Tokenizer(str_lines)
+     while not tokenizer.AtEnd():
+       self._MergeField(tokenizer, message)
+@@ -882,8 +867,11 @@ class _Parser(object):
+           raise tokenizer.ParseErrorPreviousToken('Expected "%s".' %
+                                                   (expanded_any_end_token,))
+         self._MergeField(tokenizer, expanded_any_sub_message)
++      deterministic = False
++
+       message.Pack(expanded_any_sub_message,
+-                   type_url_prefix=type_url_prefix)
++                   type_url_prefix=type_url_prefix,
++                   deterministic=deterministic)
+       return
+ 
+     if tokenizer.TryConsume('['):
+@@ -899,6 +887,8 @@ class _Parser(object):
+       # pylint: disable=protected-access
+       field = message.Extensions._FindExtensionByName(name)
+       # pylint: enable=protected-access
++
++
+       if not field:
+         if self.allow_unknown_extension:
+           field = None
+@@ -985,6 +975,7 @@ class _Parser(object):
+     if not tokenizer.TryConsume(','):
+       tokenizer.TryConsume(';')
+ 
++
+   def _ConsumeAnyTypeUrl(self, tokenizer):
+     """Consumes a google.protobuf.Any type URL and returns the type name."""
+     # Consume "type.googleapis.com/".
+@@ -1054,7 +1045,7 @@ class _Parser(object):
+       value_cpptype = field.message_type.fields_by_name['value'].cpp_type
+       if value_cpptype == descriptor.FieldDescriptor.CPPTYPE_MESSAGE:
+         value = getattr(message, field.name)[sub_message.key]
+-        value.MergeFrom(sub_message.value)
++        value.CopyFrom(sub_message.value)
+       else:
+         getattr(message, field.name)[sub_message.key] = sub_message.value
+ 
+@@ -1391,17 +1382,14 @@ class Tokenizer(object):
+ 
+   def TryConsumeInteger(self):
+     try:
+-      # Note: is_long only affects value type, not whether an error is raised.
+       self.ConsumeInteger()
+       return True
+     except ParseError:
+       return False
+ 
+-  def ConsumeInteger(self, is_long=False):
++  def ConsumeInteger(self):
+     """Consumes an integer number.
+ 
+-    Args:
+-      is_long: True if the value should be returned as a long integer.
+     Returns:
+       The integer parsed.
+ 
+@@ -1409,7 +1397,7 @@ class Tokenizer(object):
+       ParseError: If an integer couldn't be consumed.
+     """
+     try:
+-      result = _ParseAbstractInteger(self.token, is_long=is_long)
++      result = _ParseAbstractInteger(self.token)
+     except ValueError as e:
+       raise self.ParseError(str(e))
+     self.NextToken()
+@@ -1472,7 +1460,7 @@ class Tokenizer(object):
+     """
+     the_bytes = self.ConsumeByteString()
+     try:
+-      return six.text_type(the_bytes, 'utf-8')
++      return str(the_bytes, 'utf-8')
+     except UnicodeDecodeError as e:
+       raise self._StringParseError(e)
+ 
+@@ -1646,14 +1634,6 @@ def _ConsumeUint64(tokenizer):
+   return _ConsumeInteger(tokenizer, is_signed=False, is_long=True)
+ 
+ 
+-def _TryConsumeInteger(tokenizer, is_signed=False, is_long=False):
+-  try:
+-    _ConsumeInteger(tokenizer, is_signed=is_signed, is_long=is_long)
+-    return True
+-  except ParseError:
+-    return False
+-
+-
+ def _ConsumeInteger(tokenizer, is_signed=False, is_long=False):
+   """Consumes an integer number from tokenizer.
+ 
+@@ -1691,7 +1671,7 @@ def ParseInteger(text, is_signed=False,
+     ValueError: Thrown Iff the text is not a valid integer.
+   """
+   # Do the actual parsing. Exception handling is propagated to caller.
+-  result = _ParseAbstractInteger(text, is_long=is_long)
++  result = _ParseAbstractInteger(text)
+ 
+   # Check if the integer is sane. Exceptions handled by callers.
+   checker = _INTEGER_CHECKERS[2 * int(is_long) + int(is_signed)]
+@@ -1699,12 +1679,11 @@ def ParseInteger(text, is_signed=False,
+   return result
+ 
+ 
+-def _ParseAbstractInteger(text, is_long=False):
++def _ParseAbstractInteger(text):
+   """Parses an integer without checking size/signedness.
+ 
+   Args:
+     text: The text to parse.
+-    is_long: True if the value should be returned as a long integer.
+ 
+   Returns:
+     The integer value.
+@@ -1720,13 +1699,7 @@ def _ParseAbstractInteger(text, is_long=
+     # we always use the '0o' prefix for multi-digit numbers starting with 0.
+     text = c_octal_match.group(1) + '0o' + c_octal_match.group(2)
+   try:
+-    # We force 32-bit values to int and 64-bit values to long to make
+-    # alternate implementations where the distinction is more significant
+-    # (e.g. the C++ implementation) simpler.
+-    if is_long:
+-      return long(text, 0)
+-    else:
+-      return int(text, 0)
++    return int(text, 0)
+   except ValueError:
+     raise ValueError('Couldn\'t parse integer: %s' % orig_text)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index cf41616..88f730a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,5 @@ qtwebengine-icu74.patch
 
 remove_imp_imports_mojom.patch
 remove_imp_imports_protobufs.patch
+drop_python2_support.patch
+remove_six_moves_from_protobuf.patch