# HG changeset patch # User Yuya Nishihara # Date 1505618596 -32400 # Node ID 5ce32fe7df349503fb6be871cee472de71fc7ab1 # Parent c43d055ae405f71d112a838a669950bcb35acd89 py3: fix doctests in patch.py to be compatible with Python 3 We were lucky that parsepatch() could concatenate a character slice as if it were a list of chunks. diff -r c43d055ae405 -r 5ce32fe7df34 mercurial/patch.py --- a/mercurial/patch.py Sun Sep 17 12:20:35 2017 +0900 +++ b/mercurial/patch.py Sun Sep 17 12:23:16 2017 +0900 @@ -1490,7 +1490,7 @@ ... 5 ... d ... +lastline""" - >>> hunks = parsepatch(rawpatch) + >>> hunks = parsepatch([rawpatch]) >>> hunkscomingfromfilterpatch = [] >>> for h in hunks: ... hunkscomingfromfilterpatch.append(h) @@ -1501,7 +1501,7 @@ >>> fp = util.stringio() >>> for c in reversedhunks: ... c.write(fp) - >>> fp.seek(0) + >>> fp.seek(0) or None >>> reversedpatch = fp.read() >>> print(pycompat.sysstr(reversedpatch)) diff --git a/folder1/g b/folder1/g diff -r c43d055ae405 -r 5ce32fe7df34 tests/test-doctest.py --- a/tests/test-doctest.py Sun Sep 17 12:20:35 2017 +0900 +++ b/tests/test-doctest.py Sun Sep 17 12:23:16 2017 +0900 @@ -57,7 +57,7 @@ testmod('mercurial.match') testmod('mercurial.mdiff') testmod('mercurial.minirst') -testmod('mercurial.patch', py3=False) # py3: bytes[n], etc. ? +testmod('mercurial.patch') testmod('mercurial.pathutil', py3=False) # py3: os.sep testmod('mercurial.parser') testmod('mercurial.pycompat')