commit 130e37f3e263af29de31d75170ff665ec3ab076b
author Tim Peters <tim.peters@gmail.com> Sun Oct 03 19:03:19 2004 +0000
committer Tim Peters <tim.peters@gmail.com> Sun Oct 03 19:03:19 2004 +0000
tree 362c30d4cf4ad2a315253b78bc001ee682bf2f59
parent ab9b32c0778655db5d2bf3f4c34d3a205d87a1af

Read the text files to be compared in universal-newline mode.

Tools/scripts/diff.py

diff --git a/Tools/scripts/diff.py b/Tools/scripts/diff.py
index 05bfc25..52dcab1 100644
--- a/Tools/scripts/diff.py
+++ b/Tools/scripts/diff.py
@@ -31,8 +31,8 @@
 
     fromdate = time.ctime(os.stat(fromfile).st_mtime)
     todate = time.ctime(os.stat(tofile).st_mtime)
-    fromlines = open(fromfile).readlines()
-    tolines = open(tofile).readlines()
+    fromlines = open(fromfile, 'U').readlines()
+    tolines = open(tofile, 'U').readlines()
 
     if options.u:
         diff = difflib.unified_diff(fromlines, tolines, fromfile, tofile, fromdate, todate, n=n)

Tools/scripts/ndiff.py

diff --git a/Tools/scripts/ndiff.py b/Tools/scripts/ndiff.py
index f399338..88712b8 100755
--- a/Tools/scripts/ndiff.py
+++ b/Tools/scripts/ndiff.py
@@ -60,7 +60,7 @@
 # couldn't be opened
 def fopen(fname):
     try:
-        return open(fname, 'r')
+        return open(fname, 'U')
     except IOError, detail:
         return fail("couldn't open " + fname + ": " + str(detail))