Index: dis.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/dis.py,v
retrieving revision 1.48
diff -u -r1.48 dis.py
--- dis.py	12 Feb 2004 17:35:06 -0000	1.48
+++ dis.py	28 Mar 2004 06:27:48 -0000
@@ -210,7 +210,7 @@
     if fn is None:
         f = sys.stdin
     else:
-        f = open(fn)
+        f = open(fn, 'U')
     source = f.read()
     if fn is not None:
         f.close()
Index: trace.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/trace.py,v
retrieving revision 1.18
diff -u -r1.18 trace.py
--- trace.py	19 Feb 2004 19:16:50 -0000	1.18
+++ trace.py	28 Mar 2004 06:27:48 -0000
@@ -382,7 +382,7 @@
     """Return dict where keys are line numbers in the line number table."""
     assert filename.endswith('.py')
     try:
-        prog = open(filename).read()
+        prog = open(filename, 'U').read()
     except IOError, err:
         print >> sys.stderr, ("Not printing coverage data for %r: %s"
                               % (filename, err))
Index: ./idlelib/PyShell.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/PyShell.py,v
retrieving revision 1.87
diff -u -r1.87 PyShell.py
--- ./idlelib/PyShell.py	8 Mar 2004 18:15:31 -0000	1.87
+++ ./idlelib/PyShell.py	28 Mar 2004 06:27:50 -0000
@@ -546,7 +546,7 @@
     def execfile(self, filename, source=None):
         "Execute an existing file"
         if source is None:
-            source = open(filename, "r").read()
+            source = open(filename, "U").read()
         try:
             code = compile(source, filename, "exec")
         except (OverflowError, SyntaxError):
Index: idlelib/ScriptBinding.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/idlelib/ScriptBinding.py,v
retrieving revision 1.27
diff -u -r1.27 ScriptBinding.py
--- idlelib/ScriptBinding.py	12 Feb 2004 17:35:09 -0000	1.27
+++ idlelib/ScriptBinding.py	28 Mar 2004 06:27:50 -0000
@@ -82,11 +82,9 @@
         return True
 
     def checksyntax(self, filename):
-        f = open(filename, 'r')
+        f = open(filename, 'U')
         source = f.read()
         f.close()
-        if '\r' in source:
-            source = re.sub(r"\r\n", "\n", source)
         if source and source[-1] != '\n':
             source = source + '\n'
         text = self.editwin.text