( )⚙ D7765 cleanup: replace contiguous spaces in regex patterns with an explicit count

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7765

cleanup: replace contiguous spaces in regex patterns with an explicit count
ClosedPublic

Authored by mharbison72 on Dec 28 2019, 11:42 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGac3cb5e05a38: cleanup: replace contiguous spaces in regex patterns with an explicit count
Summary

Flagged by PyCharm, this form should be more readable.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Dec 28 2019, 11:42 AM
mharbison72 added a commit: rHGac3cb5e05a38: cleanup: replace contiguous spaces in regex patterns with an explicit count.Jan 8 2020, 2:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGac3cb5e05a38: cleanup: replace contiguous spaces in regex patterns with an explicit count (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/testparseutil.py (10 lines)
Mhgext/convert/monotone.py (2 lines)

Diff 18996

contrib/testparseutil.py

# - > NAMEPAT # - > NAMEPAT
# - > "NAMEPAT" # - > "NAMEPAT"
# - > 'NAMEPAT' # - > 'NAMEPAT'
namepat = ( namepat = (
r'\s*>>?\s*(?P<nquote>["\']?)(?P<name>%s)(?P=nquote)' % namepat r'\s*>>?\s*(?P<nquote>["\']?)(?P<name>%s)(?P=nquote)' % namepat
) )
self._fileres = [ self._fileres = [
# "cat > NAME << LIMIT" case # "cat > NAME << LIMIT" case
re.compile(r' \$ \s*cat' + namepat + heredoclimitpat), re.compile(r' {2}\$ \s*cat' + namepat + heredoclimitpat),
# "cat << LIMIT > NAME" case # "cat << LIMIT > NAME" case
re.compile(r' \$ \s*cat' + heredoclimitpat + namepat), re.compile(r' {2}\$ \s*cat' + heredoclimitpat + namepat),
] ]
def startsat(self, line): def startsat(self, line):
# ctx is (filename, END-LINE-OF-EMBEDDED-CODE) tuple # ctx is (filename, END-LINE-OF-EMBEDDED-CODE) tuple
for filere in self._fileres: for filere in self._fileres:
matched = filere.match(line) matched = filere.match(line)
if matched: if matched:
return ( return (
>>> matcher.codeatend(ctx, end) >>> matcher.codeatend(ctx, end)
>>> end = '\\n' >>> end = '\\n'
>>> matcher.endsat(ctx, end) >>> matcher.endsat(ctx, end)
True True
>>> matcher.codeatend(ctx, end) >>> matcher.codeatend(ctx, end)
""" """
_prefix = ' >>> ' _prefix = ' >>> '
_prefixre = re.compile(r' (>>>|\.\.\.) ') _prefixre = re.compile(r' {2}(>>>|\.\.\.) ')
# If a line matches against not _prefixre but _outputre, that line # If a line matches against not _prefixre but _outputre, that line
# is "an expected output line" (= not a part of code fragment). # is "an expected output line" (= not a part of code fragment).
# #
# Strictly speaking, a line matching against "(#if|#else|#endif)" # Strictly speaking, a line matching against "(#if|#else|#endif)"
# is also treated similarly in "inline python code" semantics by # is also treated similarly in "inline python code" semantics by
# run-tests.py. But "directive line inside inline python code" # run-tests.py. But "directive line inside inline python code"
# should be rejected by Mercurial reviewers. Therefore, this # should be rejected by Mercurial reviewers. Therefore, this
# regexp does not matche against such directive lines. # regexp does not matche against such directive lines.
_outputre = re.compile(r' $| [^$]') _outputre = re.compile(r' {2}$| {2}[^$]')
def __init__(self): def __init__(self):
super(pydoctestmatcher, self).__init__("doctest style python code") super(pydoctestmatcher, self).__init__("doctest style python code")
def startsat(self, line): def startsat(self, line):
# ctx is "True" # ctx is "True"
return line.startswith(self._prefix) return line.startswith(self._prefix)
>>> ctx = matcher.startsat(' $ python << NO_CHECK_EOF\\n') >>> ctx = matcher.startsat(' $ python << NO_CHECK_EOF\\n')
>>> matcher.ignores(ctx) >>> matcher.ignores(ctx)
True True
""" """
_prefix = ' > ' _prefix = ' > '
_startre = re.compile( _startre = re.compile(
r' \$ (\$PYTHON|"\$PYTHON"|python).*' + heredoclimitpat r' {2}\$ (\$PYTHON|"\$PYTHON"|python).*' + heredoclimitpat
) )
def __init__(self): def __init__(self):
super(pyheredocmatcher, self).__init__("heredoc python invocation") super(pyheredocmatcher, self).__init__("heredoc python invocation")
def startsat(self, line): def startsat(self, line):
# ctx is END-LINE-OF-EMBEDDED-CODE # ctx is END-LINE-OF-EMBEDDED-CODE
matched = self._startre.match(line) matched = self._startre.match(line)

hgext/convert/monotone.py

b"changelog": b"<missing>", b"changelog": b"<missing>",
b"branch": b"<missing>", b"branch": b"<missing>",
} }
certlist = self.mtnrun(b"certs", rev) certlist = self.mtnrun(b"certs", rev)
# mtn < 0.45: # mtn < 0.45:
# key "test@selenic.com" # key "test@selenic.com"
# mtn >= 0.45: # mtn >= 0.45:
# key [ff58a7ffb771907c4ff68995eada1c4da068d328] # key [ff58a7ffb771907c4ff68995eada1c4da068d328]
certlist = re.split(br'\n\n key ["\[]', certlist) certlist = re.split(br'\n\n {6}key ["\[]', certlist)
for e in certlist: for e in certlist:
m = self.cert_re.match(e) m = self.cert_re.match(e)
if m: if m:
name, value = m.groups() name, value = m.groups()
value = value.replace(br'\"', b'"') value = value.replace(br'\"', b'"')
value = value.replace(br'\\', b'\\') value = value.replace(br'\\', b'\\')
certs[name] = value certs[name] = value
# Monotone may have subsecond dates: 2005-02-05T09:39:12.364306 # Monotone may have subsecond dates: 2005-02-05T09:39:12.364306