From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 16 Feb 2007 22:42:35 +0000 (+0000)
Subject: Allow importing mbox files from stdin
X-Git-Tag: v0.14.3~334
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/457c30933ccdf2fff533073544392a84ce6190ab

Allow importing mbox files from stdin

The UnixMailbox does not support reading from stdin as it uses seek()
(at least on Python 2.3). This patch reads the stdin into a StringIO
object.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/stgit/commands/imprt.py b/stgit/commands/imprt.py
index cc160cc..7ab0757 100644
--- a/stgit/commands/imprt.py
+++ b/stgit/commands/imprt.py
@@ -18,6 +18,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 import sys, os, re, email
 from email.Header import decode_header, make_header
 from mailbox import UnixMailbox
+from StringIO import StringIO
 from optparse import OptionParser, make_option
 
 from stgit.commands.common import *
@@ -342,7 +343,7 @@ def __import_mbox(filename, options):
     if filename:
         f = file(filename, 'rb')
     else:
-        f = sys.stdin
+        f = StringIO(sys.stdin.read())
 
     try:
         mbox = UnixMailbox(f, email.message_from_file)
@@ -355,8 +356,7 @@ def __import_mbox(filename, options):
         __create_patch(None, message, author_name, author_email,
                        author_date, diff, options)
 
-    if filename:
-        f.close()
+    f.close()
 
 def func(parser, options, args):
     """Import a GNU diff file as a new patch