# HG changeset patch # User Kyle Lippincott # Date 2019-12-05 22:01:26 # Node ID 3fe91bcd51990c8182fb454c42b0e8684efd0680 # Parent fe94af4e3dc926cf2d4d5771f1a10ebb906a526c tests: fix deprecation warning about regex flags not at beginning of expr This may only show up when running the tests under python3.6+. Currently the only test that does this is test-patchbomb-tls.t, and it only uses (?i), so that's all that's handled at the moment. Differential Revision: https://phab.mercurial-scm.org/D7552 diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -1973,7 +1973,11 @@ class TTest(Test): @staticmethod def rematch(el, l): try: - el = b'(?:' + el + b')' + # parse any flags at the beginning of the regex. Only 'i' is + # supported right now, but this should be easy to extend. + flags, el = re.match(br'^(\(\?i\))?(.*)', el).groups()[0:2] + flags = flags or b'' + el = flags + b'(?:' + el + b')' # use \Z to ensure that the regex matches to the end of the string if os.name == 'nt': return re.match(el + br'\r?\n\Z', l)