From: Guido van Rossum <guido@python.org>
Date: Sun, 21 Apr 1991 19:31:39 +0000 (+0000)
Subject: Use built-in file.read() instead of util.readfile().
X-Git-Tag: v0.9.8~968
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40b0f3aa0e814ede1cce8447c53f475f667cb792;p=thirdparty%2FPython%2Fcpython.git

Use built-in file.read() instead of util.readfile().
---

diff --git a/Lib/lib-stdwin/filewin.py b/Lib/lib-stdwin/filewin.py
index 6a224e7c0a48..a03c3f70a63c 100644
--- a/Lib/lib-stdwin/filewin.py
+++ b/Lib/lib-stdwin/filewin.py
@@ -2,17 +2,19 @@
 # File windows, a subclass of textwin (which is a subclass of gwin)
 
 import textwin
-from util import readfile
+import builtin
 
 
 # FILE WINDOW
 
 def open_readonly(fn): # Open a file window
-	w = textwin.open_readonly(fn, readfile(fn))
+	fp = builtin.open(fn, 'r')
+	w = textwin.open_readonly(fn, fp.read())
 	w.fn = fn
 	return w
 
 def open(fn): # Open a file window
-	w = textwin.open(fn, readfile(fn))
+	fp = builtin.open(fn, 'r')
+	w = textwin.open(fn, fp.read())
 	w.fn = fn
 	return w
diff --git a/Lib/stdwin/filewin.py b/Lib/stdwin/filewin.py
index 6a224e7c0a48..a03c3f70a63c 100755
--- a/Lib/stdwin/filewin.py
+++ b/Lib/stdwin/filewin.py
@@ -2,17 +2,19 @@
 # File windows, a subclass of textwin (which is a subclass of gwin)
 
 import textwin
-from util import readfile
+import builtin
 
 
 # FILE WINDOW
 
 def open_readonly(fn): # Open a file window
-	w = textwin.open_readonly(fn, readfile(fn))
+	fp = builtin.open(fn, 'r')
+	w = textwin.open_readonly(fn, fp.read())
 	w.fn = fn
 	return w
 
 def open(fn): # Open a file window
-	w = textwin.open(fn, readfile(fn))
+	fp = builtin.open(fn, 'r')
+	w = textwin.open(fn, fp.read())
 	w.fn = fn
 	return w