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

tim_one · tim_one · commit 968e7ae65c7b · 2004-10-03T19:03:19.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@37530 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -157,7 +157,11 @@ New platforms
 Tools/Demos
 -----------
 
-...
+- The text file comparison scripts ``ndiff.py`` and ``diff.py`` now
+  read the input files in universal-newline mode.  This spares them
+  from consuming a great deal of time to deduce the useless result that,
+  e.g., a file with Windows line ends and a file with Linux line ends
+  have no lines in common.
 
 
 What's New in Python 2.4 alpha 3?
diff --git a/Tools/scripts/diff.py b/Tools/scripts/diff.py
@@ -31,8 +31,8 @@ def main():
 
     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)
diff --git a/Tools/scripts/ndiff.py b/Tools/scripts/ndiff.py
@@ -60,7 +60,7 @@ def fail(msg):
 # 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))
 
