1
0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-25 17:36:13 +01:00

- tests.test_difffiles: removed "count" argument from re.sub in __canonise_diff

Old python versions don't support "count". This should fix the jenkins build
again.
This commit is contained in:
Marcus Huewe 2013-01-18 17:11:42 +01:00
parent afa1911798
commit 6a332bc1c6

View File

@ -319,8 +319,8 @@ Binary file 'binary' has changed.
# TODO: Package.get_diff should return a consistent format
# (regardless of the used python version)
def __canonise_diff(diff):
diff = re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', diff, 0, re.MULTILINE)
diff = re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', diff, 0, re.MULTILINE)
diff = re.sub('^@@ -(\d+) ', '@@ -\\1,\\1 ', diff, re.MULTILINE)
diff = re.sub('^(@@ -\d+,\d+) \+(\d+) ', '\\1 +\\2,\\2 ', diff, re.MULTILINE)
return diff
got = __canonise_diff(got)