Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

python: decode xrandr output earlier, don't use regexp on bytes

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2017-02-23 22:31:55 +01:00
parent 5e43d26abd
commit 3726c7d9c3
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qubes/ext/gui.py
View File

@ -30,7 +30,7 @@ import qubes.ext
# "LVDS connected 1024x768+0+0 (normal left inverted right) 304mm x 228mm" # "LVDS connected 1024x768+0+0 (normal left inverted right) 304mm x 228mm"
REGEX_OUTPUT = re.compile(rb''' REGEX_OUTPUT = re.compile(r'''
(?x) # ignore whitespace (?x) # ignore whitespace
^ # start of string ^ # start of string
(?P<output>[A-Za-z0-9\-]*)[ ] # LVDS VGA etc (?P<output>[A-Za-z0-9\-]*)[ ] # LVDS VGA etc
@ -58,7 +58,8 @@ def get_monitor_layout():
for line in subprocess.Popen( for line in subprocess.Popen(
['xrandr', '-q'], stdout=subprocess.PIPE).stdout: ['xrandr', '-q'], stdout=subprocess.PIPE).stdout:
if not line.startswith(b"Screen") and not line.startswith(b" "): line = line.decode()
if not line.startswith("Screen") and not line.startswith(" "):
output_params = REGEX_OUTPUT.match(line).groupdict() output_params = REGEX_OUTPUT.match(line).groupdict()
if output_params['width']: if output_params['width']:
phys_size = "" phys_size = ""