nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-python-escs' into 'main'

Browse Source 
Use raw strings for regexs containing escapes

See merge request tpo/core/tor!790
This commit is contained in:
Alexander Færøy 2023-12-11 20:18:32 +00:00
commit 0cccc7223c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/codegen/get_mozilla_ciphers.py
View File

@ -144,7 +144,7 @@ sslProto = open(ff('security/nss/lib/ssl/sslproto.h'), 'r')
sslProtoD = {} sslProtoD = {}
for line in sslProto: 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: if m:
key, value = m.groups() key, value = m.groups()
sslProtoD[key] = value sslProtoD[key] = value
@ -165,7 +165,7 @@ for fl in oSSLinclude:
continue continue
fp = open(fname, 'r') fp = open(fname, 'r')
for line in fp.readlines(): 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: if m:
value,key = m.groups() value,key = m.groups()
if key.startswith('0x') and "_CK_" in value: if key.startswith('0x') and "_CK_" in value:

2
scripts/maint/format_changelog.py
View File

@ -416,7 +416,7 @@ ISSUE_PREFIX_MAP = {
} }
# Let's turn bugs to html. # 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): def bug_html(m):
kind = m.group(1) kind = m.group(1)
prefix = m.group(2) or "" prefix = m.group(2) or ""

6
scripts/maint/lintChanges.py
View File

@ -51,7 +51,7 @@ def split_tor_version(version):
If the version is malformed, returns None. 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: if version_match is None:
return None return None
@ -120,13 +120,13 @@ def lintfile(fname):
if re.search(r'[bB]ug (\d+)', contents): if re.search(r'[bB]ug (\d+)', contents):
if not re.search(r'[Bb]ugfix on ', contents): if not re.search(r'[Bb]ugfix on ', contents):
warn("Bugfix does not say 'bugfix on X.Y.Z'") 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): contents):
warn("Bugfix does not say 'Fixes bug X; bugfix on Y'") warn("Bugfix does not say 'Fixes bug X; bugfix on Y'")
elif re.search('tor-([0-9]+)', contents): elif re.search('tor-([0-9]+)', contents):
warn("Do not prefix versions with 'tor-'. ('0.1.2', not 'tor-0.1.2'.)") warn("Do not prefix versions with 'tor-'. ('0.1.2', not 'tor-0.1.2'.)")
else: 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: 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'.)") 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: elif bugfix_match.group(0) is None: