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

diff --git a/Lib/lib-stdwin/filewin.py b/Lib/lib-stdwin/filewin.py
index 6a224e7c0a4894c8bf0b92dea829666be7253132..a03c3f70a63cdd8d1849a935c04765186ee561f0 100644 (file)
--- 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 6a224e7c0a4894c8bf0b92dea829666be7253132..a03c3f70a63cdd8d1849a935c04765186ee561f0 100755 (executable)
--- 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