python/jc
1
0
Fork 0
mirror of https://github.com/kellyjonbrazil/jc.git synced 2025-06-17 00:07:37 +02:00
Code Issues Releases Activity

make regex patterns raw strings to reduce pytest warnings

Browse Source
This commit is contained in:
Kelly Brazil
2022-09-28 15:09:06 -07:00
parent 0dd4b5f620
commit d49155df95
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jc/parsers/xrandr.py
View File

@ -219,9 +219,9 @@ except ImportError:
_screen_pattern = ( _screen_pattern = (
r"Screen (?P<screen_number>\d+): " r"Screen (?P<screen_number>\d+): "
+ "minimum (?P<minimum_width>\d+) x (?P<minimum_height>\d+), " + r"minimum (?P<minimum_width>\d+) x (?P<minimum_height>\d+), "
+ "current (?P<current_width>\d+) x (?P<current_height>\d+), " + r"current (?P<current_width>\d+) x (?P<current_height>\d+), "
+ "maximum (?P<maximum_width>\d+) x (?P<maximum_height>\d+)" + r"maximum (?P<maximum_width>\d+) x (?P<maximum_height>\d+)"
) )
@ -250,13 +250,13 @@ def _parse_screen(next_lines: List[str]) -> Optional[Screen]:
# regex101 demo link # regex101 demo link
_device_pattern = ( _device_pattern = (
r"(?P<device_name>.+) " r"(?P<device_name>.+) "
+ "(?P<is_connected>(connected|disconnected)) ?" + r"(?P<is_connected>(connected|disconnected)) ?"
+ "(?P<is_primary> primary)? ?" + r"(?P<is_primary> primary)? ?"
+ "((?P<resolution_width>\d+)x(?P<resolution_height>\d+)" + r"((?P<resolution_width>\d+)x(?P<resolution_height>\d+)"
+ "\+(?P<offset_width>\d+)\+(?P<offset_height>\d+))? " + r"\+(?P<offset_width>\d+)\+(?P<offset_height>\d+))? "
+ "(?P<rotation>(inverted|left|right))? ?" + r"(?P<rotation>(inverted|left|right))? ?"
+ "\(normal left inverted right x axis y axis\)" + r"\(normal left inverted right x axis y axis\)"
+ "( ((?P<dimension_width>\d+)mm x (?P<dimension_height>\d+)mm)?)?" + r"( ((?P<dimension_width>\d+)mm x (?P<dimension_height>\d+)mm)?)?"
) )