mirror of
https://github.com/python/cpython.git
synced 2025-09-26 10:19:53 +00:00
Merged revisions 79077,79137,79304-79305 via svnmerge from
svn+ssh://pythondev@svn.python.org/sandbox/trunk/2to3/lib2to3 ........ r79077 | benjamin.peterson | 2010-03-18 18:05:29 -0500 (Thu, 18 Mar 2010) | 1 line port detect_encoding improvements from py3k ........ r79137 | benjamin.peterson | 2010-03-20 11:12:53 -0500 (Sat, 20 Mar 2010) | 1 line add a fixer for setting sys.exitfunc #2356 ........ r79304 | benjamin.peterson | 2010-03-22 17:20:22 -0500 (Mon, 22 Mar 2010) | 1 line fix test_parser when it's run in a path with spaces #7666 ........ r79305 | benjamin.peterson | 2010-03-22 17:27:07 -0500 (Mon, 22 Mar 2010) | 1 line normalize whitespace ........
This commit is contained in:
parent
513d9aeadb
commit
798e54004f
4 changed files with 170 additions and 10 deletions
|
@ -209,6 +209,7 @@ def diff(fn, result, encoding):
|
|||
finally:
|
||||
f.close()
|
||||
try:
|
||||
return os.system("diff -u %r @" % fn)
|
||||
fn = fn.replace('"', '\\"')
|
||||
return os.system('diff -u "%s" @' % fn)
|
||||
finally:
|
||||
os.remove("@")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue