This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5825

run-tests: 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
rHG17a6e063c886: run-tests: use raw strings for regular expressions
Summary

Avoids SyntaxWarning due to invalid \ escape on Python 3.8.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 4 2019, 12:42 PM
Closed by commit rHG17a6e063c886: run-tests: 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
Mtests/run-tests.py (6 lines)

Diff 13752

tests/run-tests.py

# Bytes that break XML even in a CDATA block: control characters 0-31 # Bytes that break XML even in a CDATA block: control characters 0-31
# sans \t, \n and \r # sans \t, \n and \r
CDATA_EVIL = re.compile(br"[\000-\010\013\014\016-\037]") CDATA_EVIL = re.compile(br"[\000-\010\013\014\016-\037]")
# Match feature conditionalized output lines in the form, capturing the feature # Match feature conditionalized output lines in the form, capturing the feature
# list in group 2, and the preceeding line output in group 1: # list in group 2, and the preceeding line output in group 1:
# #
# output..output (feature !)\n # output..output (feature !)\n
optline = re.compile(b'(.*) \((.+?) !\)\n$') optline = re.compile(br'(.*) \((.+?) !\)\n$')
def cdatasafe(data): def cdatasafe(data):
"""Make a string safe to include in a CDATA block. """Make a string safe to include in a CDATA block.
Certain control characters are illegal in a CDATA block, and Certain control characters are illegal in a CDATA block, and
there's no way to include a ]]> in a CDATA either. This function there's no way to include a ]]> in a CDATA either. This function
replaces illegal bytes with ? and adds a space between the ]] so replaces illegal bytes with ? and adds a space between the ]] so
that it won't break the CDATA block. that it won't break the CDATA block.
f.write(line + '\n') f.write(line + '\n')
hgbat = os.path.join(self._bindir, b'hg.bat') hgbat = os.path.join(self._bindir, b'hg.bat')
if os.path.isfile(hgbat): if os.path.isfile(hgbat):
# hg.bat expects to be put in bin/scripts while run-tests.py # hg.bat expects to be put in bin/scripts while run-tests.py
# installation layout put it in bin/ directly. Fix it # installation layout put it in bin/ directly. Fix it
with open(hgbat, 'rb') as f: with open(hgbat, 'rb') as f:
data = f.read() data = f.read()
if b'"%~dp0..\python" "%~dp0hg" %*' in data: if br'"%~dp0..\python" "%~dp0hg" %*' in data:
data = data.replace(b'"%~dp0..\python" "%~dp0hg" %*', data = data.replace(br'"%~dp0..\python" "%~dp0hg" %*',
b'"%~dp0python" "%~dp0hg" %*') b'"%~dp0python" "%~dp0hg" %*')
with open(hgbat, 'wb') as f: with open(hgbat, 'wb') as f:
f.write(data) f.write(data)
else: else:
print('WARNING: cannot fix hg.bat reference to python.exe') print('WARNING: cannot fix hg.bat reference to python.exe')
if self.options.anycoverage: if self.options.anycoverage:
custom = os.path.join(self._testdir, 'sitecustomize.py') custom = os.path.join(self._testdir, 'sitecustomize.py')