Modified: trunk/Tools/ChangeLog (268058 => 268059)
--- trunk/Tools/ChangeLog 2020-10-06 17:38:51 UTC (rev 268058)
+++ trunk/Tools/ChangeLog 2020-10-06 18:42:43 UTC (rev 268059)
@@ -1,3 +1,12 @@
+2020-10-06 Philippe Normand <pnorm...@igalia.com>
+
+ run-minibrowser not compatible with python3
+ https://bugs.webkit.org/show_bug.cgi?id=217368
+
+ Reviewed by Adrian Perez de Castro.
+
+ * Scripts/webkitpy/minibrowser/run_webkit_app.py: Use webkitcorepy's unicode().
+
2020-10-06 Adrian Perez de Castro <ape...@igalia.com>
REGRESSION(r267399): [WPE] Build broken with ENABLE_ACCESSIBILITY=OFF
Modified: trunk/Tools/Scripts/webkitpy/minibrowser/run_webkit_app.py (268058 => 268059)
--- trunk/Tools/Scripts/webkitpy/minibrowser/run_webkit_app.py 2020-10-06 17:38:51 UTC (rev 268058)
+++ trunk/Tools/Scripts/webkitpy/minibrowser/run_webkit_app.py 2020-10-06 18:42:43 UTC (rev 268059)
@@ -24,8 +24,8 @@
from webkitpy.common.host import Host
from webkitpy.port import configuration_options, platform_options, factory
+from webkitcorepy.string_utils import decode
-
def main(argv):
option_parser = argparse.ArgumentParser(usage="%(prog)s [options] [url]", add_help=False)
groups = [("Platform options", platform_options()), ("Configuration options", configuration_options())]
@@ -44,7 +44,7 @@
option_group.add_argument(option.get_opt_string(), action="" dest=option.dest,
help=option.help, const=option.const, default=default)
- option_parser.add_argument('url', metavar='url', type=lambda s: unicode(s, 'utf8'), nargs='?',
+ option_parser.add_argument('url', metavar='url', type=lambda s: decode(s, 'utf8'), nargs='?',
help='Website URL to load')
options, args = option_parser.parse_known_args(argv)
@@ -54,7 +54,7 @@
# Convert unregistered command-line arguments to utf-8 and append parsed
# URL. convert_arg_line_to_args() returns a list containing a single
# string, so it needs to be split again.
- browser_args = [unicode(s, "utf-8") for s in option_parser.convert_arg_line_to_args(' '.join(args))[0].split()]
+ browser_args = [decode(s, "utf-8") for s in option_parser.convert_arg_line_to_args(' '.join(args))[0].split()]
if options.url:
browser_args.append(options.url)
