summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/lib-old/util.py25
-rw-r--r--Lib/util.py25
2 files changed, 46 insertions, 4 deletions
diff --git a/Lib/lib-old/util.py b/Lib/lib-old/util.py
index dc67686..7a9caf7 100644
--- a/Lib/lib-old/util.py
+++ b/Lib/lib-old/util.py
@@ -1,9 +1,30 @@
-# Module 'util' -- some useful functions that dont fit elsewhere
+# Module 'util' -- some useful functions that don't fit elsewhere
-# Remove an item from a list at most once
+
+# 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
+
+
+# Return a string containing a file's contents.
+#
+def readfile(fn):
+ return readopenfile(open(fn, 'r'))
+
+
+# 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
diff --git a/Lib/util.py b/Lib/util.py
index dc67686..7a9caf7 100644
--- a/Lib/util.py
+++ b/Lib/util.py
@@ -1,9 +1,30 @@
-# Module 'util' -- some useful functions that dont fit elsewhere
+# Module 'util' -- some useful functions that don't fit elsewhere
-# Remove an item from a list at most once
+
+# 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
+
+
+# Return a string containing a file's contents.
+#
+def readfile(fn):
+ return readopenfile(open(fn, 'r'))
+
+
+# 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