( )⚙ D7766 cleanup: drop redundant character escapes from `[]` character sets

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7766

cleanup: drop redundant character escapes from `[]` character sets
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG6d3b67a837a6: cleanup: drop redundant character escapes from `[]` character sets
Summary

Flagged by PyCharm. Most special characters lose their special meaning inside
square brackets. The - in util.py doesn't need to be escaped because it is
the last character in the set.

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

mharbison72 created this revision.Dec 28 2019, 11:42 AM
mharbison72 added a commit: rHG6d3b67a837a6: cleanup: drop redundant character escapes from `[]` character sets.Jan 8 2020, 2:49 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG6d3b67a837a6: cleanup: drop redundant character escapes from `[]` character sets (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/convert/cvs.py (4 lines)
Mmercurial/hgweb/wsgiheaders.py (2 lines)
Mmercurial/ui.py (2 lines)
Mmercurial/util.py (2 lines)
Mtests/run-tests.py (4 lines)

Diff 19095

hgext/convert/cvs.py

conntype = None conntype = None
user, host = None, None user, host = None, None
cmd = [b'cvs', b'server'] cmd = [b'cvs', b'server']
self.ui.status(_(b"connecting to %s\n") % root) self.ui.status(_(b"connecting to %s\n") % root)
if root.startswith(b":pserver:"): if root.startswith(b":pserver:"):
root = root[9:] root = root[9:]
m = re.match( m = re.match(r'(?:(.*?)(?::(.*?))?@)?([^:/]*)(?::(\d*))?(.*)', root)
r'(?:(.*?)(?::(.*?))?@)?([^:\/]*)(?::(\d*))?(.*)', root
)
if m: if m:
conntype = b"pserver" conntype = b"pserver"
user, passw, serv, port, root = m.groups() user, passw, serv, port, root = m.groups()
if not user: if not user:
user = b"anonymous" user = b"anonymous"
if not port: if not port:
port = 2401 port = 2401
else: else:

mercurial/hgweb/wsgiheaders.py

"""This was forked from cpython's wsgiref.headers module to work on bytes. """This was forked from cpython's wsgiref.headers module to work on bytes.
Header from old file showing copyright is below. Header from old file showing copyright is below.
Much of this module is red-handedly pilfered from email.message in the stdlib, Much of this module is red-handedly pilfered from email.message in the stdlib,
so portions are Copyright (C) 2001,2002 Python Software Foundation, and were so portions are Copyright (C) 2001,2002 Python Software Foundation, and were
written by Barry Warsaw. written by Barry Warsaw.
""" """
# Regular expression that matches `special' characters in parameters, the # Regular expression that matches `special' characters in parameters, the
# existence of which force quoting of the parameter value. # existence of which force quoting of the parameter value.
from __future__ import absolute_import, print_function from __future__ import absolute_import, print_function
import re import re
tspecials = re.compile(br'[ \(\)<>@,;:\\"/\[\]\?=]') tspecials = re.compile(br'[ ()<>@,;:\\"/\[\]?=]')
def _formatparam(param, value=None, quote=1): def _formatparam(param, value=None, quote=1):
"""Convenience function to format and return a key=value pair. """Convenience function to format and return a key=value pair.
This will quote the value if needed or if quote is true. This will quote the value if needed or if quote is true.
""" """
if value is not None and len(value) > 0: if value is not None and len(value) > 0:
if quote or tspecials.search(value): if quote or tspecials.search(value):

mercurial/ui.py

('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')]) ('want lots of $$money$$?', [('s', 'Yes'), ('o', 'No')])
""" """
# Sadly, the prompt string may have been built with a filename # Sadly, the prompt string may have been built with a filename
# containing "$$" so let's try to find the first valid-looking # containing "$$" so let's try to find the first valid-looking
# prompt to start parsing. Sadly, we also can't rely on # prompt to start parsing. Sadly, we also can't rely on
# choices containing spaces, ASCII, or basically anything # choices containing spaces, ASCII, or basically anything
# except an ampersand followed by a character. # except an ampersand followed by a character.
m = re.match(br'(?s)(.+?)\$\$([^\$]*&[^ \$].*)', prompt) m = re.match(br'(?s)(.+?)\$\$([^$]*&[^ $].*)', prompt)
msg = m.group(1) msg = m.group(1)
choices = [p.strip(b' ') for p in m.group(2).split(b'$$')] choices = [p.strip(b' ') for p in m.group(2).split(b'$$')]
def choicetuple(s): def choicetuple(s):
ampidx = s.index(b'&') ampidx = s.index(b'&')
return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1) return s[ampidx + 1 : ampidx + 2].lower(), s.replace(b'&', b'', 1)
return (msg, [choicetuple(s) for s in choices]) return (msg, [choicetuple(s) for s in choices])

mercurial/util.py

(None, None, None, '.1.2.3') (None, None, None, '.1.2.3')
>>> versiontuple(b'12.34..5') >>> versiontuple(b'12.34..5')
(12, 34, None, '..5') (12, 34, None, '..5')
>>> versiontuple(b'1.2.3.4.5.6') >>> versiontuple(b'1.2.3.4.5.6')
(1, 2, 3, '.4.5.6') (1, 2, 3, '.4.5.6')
""" """
if not v: if not v:
v = version() v = version()
m = remod.match(br'(\d+(?:\.\d+){,2})[\+-]?(.*)', v) m = remod.match(br'(\d+(?:\.\d+){,2})[+-]?(.*)', v)
if not m: if not m:
vparts, extra = b'', v vparts, extra = b'', v
elif m.group(2): elif m.group(2):
vparts, extra = m.groups() vparts, extra = m.groups()
else: else:
vparts, extra = m.group(1), None vparts, extra = m.group(1), None
assert vparts is not None # help pytype assert vparts is not None # help pytype

tests/run-tests.py

if os.path.isdir(arg): if os.path.isdir(arg):
if not arg.endswith(b'/'): if not arg.endswith(b'/'):
arg += b'/' arg += b'/'
expanded_args.extend([arg + a for a in os.listdir(arg)]) expanded_args.extend([arg + a for a in os.listdir(arg)])
else: else:
expanded_args.append(arg) expanded_args.append(arg)
args = expanded_args args = expanded_args
testcasepattern = re.compile( testcasepattern = re.compile(br'([\w-]+\.t|py)(?:#([a-zA-Z0-9_\-.#]+))')
br'([\w-]+\.t|py)(?:#([a-zA-Z0-9_\-\.#]+))'
)
tests = [] tests = []
for t in args: for t in args:
case = [] case = []
if not ( if not (
os.path.basename(t).startswith(b'test-') os.path.basename(t).startswith(b'test-')
and (t.endswith(b'.py') or t.endswith(b'.t')) and (t.endswith(b'.py') or t.endswith(b'.t'))
): ):