Skip to content

Added raw string prefixes to regex strings #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added raw string prefixes to regex strings #418

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions autorandr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,8 +518,8 @@ def from_config_file(cls, profile, edid_map, configuration):
edid = edid_map[options["output"]]
else:
# This fuzzy matching is for legacy autorandr that used sysfs output names
fuzzy_edid_map = [re.sub("(card[0-9]+|-)", "", x) for x in edid_map.keys()]
fuzzy_output = re.sub("(card[0-9]+|-)", "", options["output"])
fuzzy_edid_map = [re.sub(r"(card[0-9]+|-)", "", x) for x in edid_map.keys()]
fuzzy_output = re.sub(r"(card[0-9]+|-)", "", options["output"])
if fuzzy_output in fuzzy_edid_map:
edid = edid_map[list(edid_map.keys())[fuzzy_edid_map.index(fuzzy_output)]]
elif "off" not in options:
Expand Down Expand Up @@ -626,10 +626,10 @@ def parse_xrandr_output(
raise AutorandrException("Failed to run xrandr")

# We are not interested in screens
xrandr_output = re.sub("(?m)^Screen [0-9].+", "", xrandr_output).strip()
xrandr_output = re.sub(r"(?m)^Screen [0-9].+", "", xrandr_output).strip()

# Split at output boundaries and instantiate an XrandrOutput per output
split_xrandr_output = re.split("(?m)^([^ ]+ (?:(?:dis)?connected|unknown connection).*)$", xrandr_output)
split_xrandr_output = re.split(r"(?m)^([^ ]+ (?:(?:dis)?connected|unknown connection).*)$", xrandr_output)
if len(split_xrandr_output) < 2:
raise AutorandrException("No output boundaries found", report_bug=True)
outputs = OrderedDict()
Expand Down Expand Up @@ -868,7 +868,7 @@ def get_fb_dimensions(configuration):
if "off" in output.options or not output.edid:
continue
# This won't work with all modes -- but it's a best effort.
match = re.search("[0-9]{3,}x[0-9]{3,}", output.options["mode"])
match = re.search(r"[0-9]{3,}x[0-9]{3,}", output.options["mode"])
if not match:
return None
o_mode = match.group(0)
Expand Down