Commit abbcf010 authored by Erik Jensen's avatar Erik Jensen Committed by Commit Bot

remoting: Fix --watch-resolution for Python 3

Bug: 1084669
Change-Id: I77ca302c8310d2705aec14241c961d8ae2ac9bde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2209349Reviewed-by: default avatarLambros Lambrou <lambroslambrou@chromium.org>
Commit-Queue: Erik Jensen <rkjnsn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#770374}
parent 55d9e113
......@@ -1362,7 +1362,7 @@ def watch_for_resolution_changes(initial_size):
xrandr_output = subprocess.Popen(["xrandr"],
stdout=subprocess.PIPE).communicate()[0]
matches = re.search(r'current (\d+) x (\d+), maximum (\d+) x (\d+)',
matches = re.search(br'current (\d+) x (\d+), maximum (\d+) x (\d+)',
xrandr_output)
# No need to handle ValueError. If xrandr fails to give valid output,
......@@ -1530,7 +1530,7 @@ Web Store: https://chrome.google.com/remotedesktop"""
return 0
if options.watch_resolution:
watch_for_resolution_changes(options.watch_resolution)
watch_for_resolution_changes(tuple(options.watch_resolution))
return 0
if not options.start:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment