From 36b3602292fc1321dbd03aaff6215ec4a232d7f0 Mon Sep 17 00:00:00 2001 From: Matt Rose Date: Thu, 15 Feb 2024 21:44:14 -0500 Subject: [PATCH] fix syntax warnings Got the following Warnings when running under python 3.12.1 home/mattrose/Code/terminator/terminatorlib/terminal.py:324: SyntaxWarning: invalid escape sequence '\[' hostchars = "-A-Za-z0-9:\[\]" /home/mattrose/Code/terminator/terminatorlib/terminal.py:348: SyntaxWarning: invalid escape sequence '\.' "(www|ftp)[" + hostchars + "]*\.[" + hostchars + /home/mattrose/Code/terminator/terminatorlib/terminal.py:354: SyntaxWarning: invalid escape sequence '\.' "[a-zA-Z0-9-]*\.[a-zA-Z0-9][a-zA-Z0-9-]+" + /home/mattrose/Code/terminator/terminatorlib/terminal.py:359: SyntaxWarning: invalid escape sequence '\^' """news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@""" + To fix this, I changed the strings to raw strings to pass to the regex --- terminatorlib/terminal.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/terminatorlib/terminal.py b/terminatorlib/terminal.py index 3c82deda..c34b7ab6 100644 --- a/terminatorlib/terminal.py +++ b/terminatorlib/terminal.py @@ -321,7 +321,7 @@ def update_url_matches(self): """Update the regexps used to match URLs""" userchars = "-A-Za-z0-9" passchars = "-A-Za-z0-9,?;.:/!%$^*&~\"#'" - hostchars = "-A-Za-z0-9:\[\]" + hostchars = r"-A-Za-z0-9:\[\]" pathchars = "-A-Za-z0-9_$.+!*(),;:@&=?/~#%'" schemes = "(news:|telnet:|nntp:|file:/|https?:|ftps?:|webcal:|ssh:)" user = "[" + userchars + "]+(:[" + passchars + "]+)?" @@ -345,18 +345,18 @@ def update_url_matches(self): self._add_regex('voip', re) re = (lboundry + - "(www|ftp)[" + hostchars + "]*\.[" + hostchars + + "(www|ftp)[" + hostchars + r"]*\.[" + hostchars + ".]+(:[0-9]+)?(" + urlpath + ")?" + rboundry + "/?") self._add_regex('addr_only', re) re = (lboundry + "(mailto:)?[a-zA-Z0-9][a-zA-Z0-9.+-]*@[a-zA-Z0-9]" + - "[a-zA-Z0-9-]*\.[a-zA-Z0-9][a-zA-Z0-9-]+" + + r"[a-zA-Z0-9-]*\.[a-zA-Z0-9][a-zA-Z0-9-]+" + "[.a-zA-Z0-9-]*" + rboundry) self._add_regex('email', re) re = (lboundry + - """news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@""" + + r"""news:[-A-Z\^_a-z{|}~!"#$%&'()*+,./0-9;:=?`]+@""" + "[-A-Za-z0-9.]+(:[0-9]+)?" + rboundry) self._add_regex('nntp', re)