(original) (raw)

changeset: 101918:be193f8dbe4c parent: 101914:84d1e5a4b1c5 parent: 101917:a2482e805dff user: Martin Panter vadmium+py@gmail.com date: Sun Jun 12 06:08:29 2016 +0000 files: Lib/lib2to3/tests/test_refactor.py description: Issue #27030: Merge RE fix from 3.5 diff -r 84d1e5a4b1c5 -r be193f8dbe4c Lib/lib2to3/tests/test_refactor.py --- a/Lib/lib2to3/tests/test_refactor.py Sun Jun 12 04:31:25 2016 +0000 +++ b/Lib/lib2to3/tests/test_refactor.py Sun Jun 12 06:08:29 2016 +0000 @@ -8,6 +8,7 @@ import os import codecs import io +import re import tempfile import shutil import unittest @@ -222,8 +223,8 @@ actually_write=False) # Testing that it logged this message when write=False was passed is # sufficient to see that it did not bail early after "No changes". - message_regex = r"Not writing changes to .*%s%s" % ( - os.sep, os.path.basename(test_file)) + message_regex = r"Not writing changes to .*%s" % \ + re.escape(os.sep + os.path.basename(test_file)) for message in debug_messages: if "Not writing changes" in message: self.assertRegex(message, message_regex) /vadmium+py@gmail.com