Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
run-minibrowser not compatible with python3
https://bugs.webkit.org/show_bug.cgi?id=217368

Patch by Philippe Normand <pnormand@igalia.com> on 2020-10-06
Reviewed by Adrian Perez de Castro.

* Scripts/webkitpy/minibrowser/run_webkit_app.py: Use webkitcorepy's unicode().

Canonical link: https://commits.webkit.org/230156@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@268059 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
philn authored and webkit-commit-queue committed Oct 6, 2020
1 parent a46b2c6 commit b317c8f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
9 changes: 9 additions & 0 deletions Tools/ChangeLog
@@ -1,3 +1,12 @@
2020-10-06 Philippe Normand <pnormand@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 <aperez@igalia.com>

REGRESSION(r267399): [WPE] Build broken with ENABLE_ACCESSIBILITY=OFF
Expand Down
6 changes: 3 additions & 3 deletions Tools/Scripts/webkitpy/minibrowser/run_webkit_app.py
Expand Up @@ -24,7 +24,7 @@

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)
Expand All @@ -44,7 +44,7 @@ def main(argv):
option_group.add_argument(option.get_opt_string(), action=option.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)

Expand All @@ -54,7 +54,7 @@ def main(argv):
# 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)

Expand Down

0 comments on commit b317c8f

Please sign in to comment.