This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5826

check-config: use raw strings for regular expressions
ClosedPublic

Authored by indygreg on Feb 4 2019, 12:42 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG595a67a301ee: check-config: use raw strings for regular expressions
Summary

This avoids SyntaxWarning on Python 3.8 for invalid \ escapes.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Feb 4 2019, 12:42 PM
Closed by commit rHG595a67a301ee: check-config: use raw strings for regular expressions (authored by indygreg). · Explain WhyFeb 4 2019, 6:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/check-config.py (6 lines)

Diff 13785

contrib/check-config.py

ui\.config(?P<ctype>|int|bool|list)\( ui\.config(?P<ctype>|int|bool|list)\(
# First argument. # First argument.
['"](?P<section>\S+)['"],\s* ['"](?P<section>\S+)['"],\s*
# Second argument # Second argument
['"](?P<option>\S+)['"](,\s+ ['"](?P<option>\S+)['"](,\s+
(?:default=)?(?P<default>\S+?))? (?:default=)?(?P<default>\S+?))?
\)''', re.VERBOSE | re.MULTILINE) \)''', re.VERBOSE | re.MULTILINE)
configwithre = re.compile(b''' configwithre = re.compile(br'''
ui\.config(?P<ctype>with)\( ui\.config(?P<ctype>with)\(
# First argument is callback function. This doesn't parse robustly # First argument is callback function. This doesn't parse robustly
# if it is e.g. a function call. # if it is e.g. a function call.
[^,]+,\s* [^,]+,\s*
['"](?P<section>\S+)['"],\s* ['"](?P<section>\S+)['"],\s*
['"](?P<option>\S+)['"](,\s+ ['"](?P<option>\S+)['"](,\s+
(?:default=)?(?P<default>\S+?))? (?:default=)?(?P<default>\S+?))?
\)''', re.VERBOSE | re.MULTILINE) \)''', re.VERBOSE | re.MULTILINE)
prevname = b'' prevname = b''
confsect = b'' confsect = b''
carryover = b'' carryover = b''
linenum = 0 linenum = 0
for l in open(f, 'rb'): for l in open(f, 'rb'):
linenum += 1 linenum += 1
# check topic-like bits # check topic-like bits
m = re.match(b'\s*``(\S+)``', l) m = re.match(br'\s*``(\S+)``', l)
if m: if m:
prevname = m.group(1) prevname = m.group(1)
if re.match(b'^\s*-+$', l): if re.match(br'^\s*-+$', l):
sect = prevname sect = prevname
prevname = b'' prevname = b''
if sect and prevname: if sect and prevname:
name = sect + b'.' + prevname name = sect + b'.' + prevname
documented[name] = 1 documented[name] = 1
# check docstring bits # check docstring bits