regen

Author: lukem

tests/testsuite

@@ -501,9 +501,16 @@ __version__ = "17"
 class Pyrediff:
     _add_del_re = re.compile(r"^(\d+a\d+(,\d+)?|\d+(,\d+)?d\d+)$")
     _change_re = re.compile(r"^\d+(,\d+)?c\d+(,\d+)?$")
-    _ws_eol_re = re.compile(r"\\(\s)$")
-    _escape_re = re.compile(r"(?<!\\)\\([-\s!\"#&%,/:;<=>@_`'\''~])")
     _group_re = re.compile(r"\\g<([^>]+)>")
+    if sys.version_info < (3,3):
+        _escape_re = re.compile(r"\\([-\s!\"#&%,/:;<=>@_`'\''~])")
+    elif sys.version_info < (3,7):
+        # 3.3 .. 3.6 doesn'\''t escape "_"
+        _escape_re = re.compile(r"\\([-\s!\"#&%,/:;<=>@`'\''~])")
+    else:
+        # 3.7+ doesn'\''t escape '\''!'\'', '\''"'\'', '\''%'\'', "'\''", '\'','\'', '\''/'\'', '\'':'\'', '\'';'\'',
+        # '\''<'\'', '\''='\'', '\''>'\'', '\''@'\'', and "`"
+        _escape_re = re.compile(r"\\([-\s#&%,~])")
 
     def __init__(self):
         self.fail = False
@@ -520,7 +527,6 @@ class Pyrediff:
         with io.open(input_name, "r", encoding="utf-8") as output_fp:
             for line in output_fp:
                 esc = re.escape(line)
-                esc = self._ws_eol_re.sub(r"\1", esc)
                 esc = self._escape_re.sub(r"\1", esc)
                 sys.stdout.write(esc)
 
@@ -3111,9 +3117,16 @@ __version__ = "17"
 class Pyrediff:
     _add_del_re = re.compile(r"^(\d+a\d+(,\d+)?|\d+(,\d+)?d\d+)$")
     _change_re = re.compile(r"^\d+(,\d+)?c\d+(,\d+)?$")
-    _ws_eol_re = re.compile(r"\\(\s)$")
-    _escape_re = re.compile(r"(?<!\\)\\([-\s!\"#&%,/:;<=>@_`'~])")
     _group_re = re.compile(r"\\g<([^>]+)>")
+    if sys.version_info < (3,3):
+        _escape_re = re.compile(r"\\([-\s!\"#&%,/:;<=>@_`'~])")
+    elif sys.version_info < (3,7):
+        # 3.3 .. 3.6 doesn't escape "_"
+        _escape_re = re.compile(r"\\([-\s!\"#&%,/:;<=>@`'~])")
+    else:
+        # 3.7+ doesn't escape '!', '"', '%', "'", ',', '/', ':', ';',
+        # '<', '=', '>', '@', and "`"
+        _escape_re = re.compile(r"\\([-\s#&%,~])")
 
     def __init__(self):
         self.fail = False
@@ -3130,7 +3143,6 @@ class Pyrediff:
         with io.open(input_name, "r", encoding="utf-8") as output_fp:
             for line in output_fp:
                 esc = re.escape(line)
-                esc = self._ws_eol_re.sub(r"\1", esc)
                 esc = self._escape_re.sub(r"\1", esc)
                 sys.stdout.write(esc)