Ignore trailing (and leading) newlines in diff chunks.

- Legacy-Id: 447
This commit is contained in:
Henrik Levkowetz 2007-06-16 21:41:04 +00:00
parent c4041cd9ab
commit c37319ccd7

View file

@ -112,7 +112,7 @@ class UrlTestCase(TestCase):
for item in os.listdir(testdir): for item in os.listdir(testdir):
path = testdir + "/" + item path = testdir + "/" + item
if item.startswith("generic-") and os.path.isfile(path): if item.startswith("generic-") and os.path.isfile(path):
chunk = filetext(path) chunk = filetext(path).strip()
chunk = re.sub(r"([\[\]().|+*?])", r"\\\1", chunk) chunk = re.sub(r"([\[\]().|+*?])", r"\\\1", chunk)
# @@ -27,0 \+23,1 @@ # @@ -27,0 \+23,1 @@
chunk = re.sub(r"(?m)^@@ -\d+,(\d+) \\\+\d+,(\d+) @@$", r"@@ -\d+,\1 \+\d+,\2 @@", chunk) chunk = re.sub(r"(?m)^@@ -\d+,(\d+) \\\+\d+,(\d+) @@$", r"@@ -\d+,\1 \+\d+,\2 @@", chunk)