Patch by Eric Raymond: add an optional 'seekable' flag to the

MultiFile constructor, and only do the posstack bookkeeping when it is
true.

Lib/multifile.py

@@ -21,6 +21,11 @@
 # Note that if a nested multipart message is terminated by a separator
 # for an outer message, this is not reported, even though it is really
 # illegal input.
+#
+# If seekable is given as 0, the class code will not do the bookeeping
+# it normally attempts in order to make seeks relative to the beginning of the
+# current file part.  This may be useful when using MultiFile with a non-
+# seekable stream object.
 
 import sys
 import string
@@ -31,11 +36,14 @@ Error = 'multifile.Error'
 
 class MultiFile:
 	#
-	def __init__(self, fp):
+	seekable = 0
+	def __init__(self, fp, seekable=1):
 		self.fp = fp
 		self.stack = [] # Grows down
 		self.level = 0
 		self.last = 0
+		if seekable:
+			self.seekable = 1
 			self.start = self.fp.tell()
 			self.posstack = [] # Grows down
 	#
@@ -88,6 +96,7 @@ class MultiFile:
 		else:
 			return line
 		# Get here after break out of loop
+		if self.seekable:
 			self.lastpos = self.tell() - len(line)
 		self.level = i+1
 		if self.level > 1:
@@ -111,6 +120,7 @@ class MultiFile:
 			return 0
 		self.level = 0
 		self.last = 0
+		if self.seekable:
 			self.start = self.fp.tell()
 		return 1
 	#
@@ -118,6 +128,7 @@ class MultiFile:
 		if self.level > 0:
 			raise Error, 'bad MultiFile.push() call'
 		self.stack.insert(0, sep)
+	        if self.seekable:
                 	self.posstack.insert(0, self.start)
                 	self.start = self.fp.tell()
 	#
@@ -130,6 +141,7 @@ class MultiFile:
 			abslastpos = self.lastpos + self.start
 		self.level = max(0, self.level - 1)
 		del self.stack[0]
+		if self.seekable:
 			self.start = self.posstack[0]
 			del self.posstack[0]
 			if self.level > 0: