From d9d2c8246c238ac95057b082aa64b5db00a398a4 Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Sun, 7 Apr 1991 13:43:34 +0000
Subject: This is no longer needed, since all these functions are now built-in
 (with different interfaces). Change the module definition to call the
 built-in functions, for compatibility.

---
 Lib/lib-old/util.py | 17 ++++++-----------
 Lib/util.py         | 17 ++++++-----------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/Lib/lib-old/util.py b/Lib/lib-old/util.py
index 7a9caf7..bb0a870 100644
--- a/Lib/lib-old/util.py
+++ b/Lib/lib-old/util.py
@@ -1,15 +1,16 @@
 # Module 'util' -- some useful functions that don't fit elsewhere
 
+# NB: These are now built-in functions, but this module is provided
+# for compatibility.  Don't use in new programs unless you need backward
+# compatibility (with old interpreters).
+
 
 # Remove an item from a list.
 # No complaints if it isn't in the list at all.
 # If it occurs more than once, remove the first occurrence.
 #
 def remove(item, list):
-	for i in range(len(list)):
-		if list[i] = item:
-			del list[i]
-			break
+	if item in list: list.remove(item)
 
 
 # Return a string containing a file's contents.
@@ -21,10 +22,4 @@ def readfile(fn):
 # Read an open file until EOF.
 #
 def readopenfile(fp):
-	BUFSIZE = 512*8
-	data = ''
-	while 1:
-		buf = fp.read(BUFSIZE)
-		if not buf: break
-		data = data + buf
-	return data
+	return fp.read()
diff --git a/Lib/util.py b/Lib/util.py
index 7a9caf7..bb0a870 100644
--- a/Lib/util.py
+++ b/Lib/util.py
@@ -1,15 +1,16 @@
 # Module 'util' -- some useful functions that don't fit elsewhere
 
+# NB: These are now built-in functions, but this module is provided
+# for compatibility.  Don't use in new programs unless you need backward
+# compatibility (with old interpreters).
+
 
 # Remove an item from a list.
 # No complaints if it isn't in the list at all.
 # If it occurs more than once, remove the first occurrence.
 #
 def remove(item, list):
-	for i in range(len(list)):
-		if list[i] = item:
-			del list[i]
-			break
+	if item in list: list.remove(item)
 
 
 # Return a string containing a file's contents.
@@ -21,10 +22,4 @@ def readfile(fn):
 # Read an open file until EOF.
 #
 def readopenfile(fp):
-	BUFSIZE = 512*8
-	data = ''
-	while 1:
-		buf = fp.read(BUFSIZE)
-		if not buf: break
-		data = data + buf
-	return data
+	return fp.read()
-- 
cgit v0.12