mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-09 20:53:45 +01:00
Use raw strings for regexs containing escapes
In Python 3.12, these invalid escape sequences emit SyntaxWarnings, and will emit SyntaxErrors in a future release. Found using: grep '[^r]["'\''].*\\[^rn\\x0t"]' $(grep -rl '^#!.*python')
This commit is contained in:
parent
82e73df8f7
commit
9f731ac68c
@ -144,7 +144,7 @@ sslProto = open(ff('security/nss/lib/ssl/sslproto.h'), 'r')
|
||||
sslProtoD = {}
|
||||
|
||||
for line in sslProto:
|
||||
m = re.match('#define\s+(\S+)\s+(\S+)', line)
|
||||
m = re.match(r'#define\s+(\S+)\s+(\S+)', line)
|
||||
if m:
|
||||
key, value = m.groups()
|
||||
sslProtoD[key] = value
|
||||
@ -165,7 +165,7 @@ for fl in oSSLinclude:
|
||||
continue
|
||||
fp = open(fname, 'r')
|
||||
for line in fp.readlines():
|
||||
m = re.match('# *define\s+(\S+)\s+(\S+)', line)
|
||||
m = re.match(r'# *define\s+(\S+)\s+(\S+)', line)
|
||||
if m:
|
||||
value,key = m.groups()
|
||||
if key.startswith('0x') and "_CK_" in value:
|
||||
|
@ -416,7 +416,7 @@ ISSUE_PREFIX_MAP = {
|
||||
}
|
||||
|
||||
# Let's turn bugs to html.
|
||||
BUG_PAT = re.compile('(bug|ticket|issue|feature)\s+([\w/]+#)?(\d{4,6})', re.I)
|
||||
BUG_PAT = re.compile(r'(bug|ticket|issue|feature)\s+([\w/]+#)?(\d{4,6})', re.I)
|
||||
def bug_html(m):
|
||||
kind = m.group(1)
|
||||
prefix = m.group(2) or ""
|
||||
|
@ -51,7 +51,7 @@ def split_tor_version(version):
|
||||
|
||||
If the version is malformed, returns None.
|
||||
'''
|
||||
version_match = re.match('([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?', version)
|
||||
version_match = re.match(r'([0-9]+)\.([0-9]+)\.([0-9]+)(\.([0-9]+))?', version)
|
||||
if version_match is None:
|
||||
return None
|
||||
|
||||
@ -120,13 +120,13 @@ def lintfile(fname):
|
||||
if re.search(r'[bB]ug (\d+)', contents):
|
||||
if not re.search(r'[Bb]ugfix on ', contents):
|
||||
warn("Bugfix does not say 'bugfix on X.Y.Z'")
|
||||
elif not re.search('[fF]ixes ([a-z ]*)bugs? (\d+)((, \d+)* and \d+)?; bugfix on ',
|
||||
elif not re.search(r'[fF]ixes ([a-z ]*)bugs? (\d+)((, \d+)* and \d+)?; bugfix on ',
|
||||
contents):
|
||||
warn("Bugfix does not say 'Fixes bug X; bugfix on Y'")
|
||||
elif re.search('tor-([0-9]+)', contents):
|
||||
warn("Do not prefix versions with 'tor-'. ('0.1.2', not 'tor-0.1.2'.)")
|
||||
else:
|
||||
bugfix_match = re.search('bugfix on ([0-9]+\.[0-9]+\.[0-9]+)', contents)
|
||||
bugfix_match = re.search(r'bugfix on ([0-9]+\.[0-9]+\.[0-9]+)', contents)
|
||||
if bugfix_match is None:
|
||||
warn("Versions must have at least 3 digits. ('0.1.2', '0.3.4.8', or '0.3.5.1-alpha'.)")
|
||||
elif bugfix_match.group(0) is None:
|
||||
|
Loading…
Reference in New Issue
Block a user