From: Oleg Broytman <phd@phdru.name>
Date: Sun, 2 Feb 2014 13:02:28 +0000 (+0400)
Subject: Test stdin only
X-Git-Tag: v2.3.3~2
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=29fcdcb768fbd333ee3aefa94336013bbcb6f298;p=mimedecode.git

Test stdin only

When testing for redirects it's enough to test only stdin.
But if stdout is also at console -- it's not an error; print usage help
and exit.
---

diff --git a/mimedecode.py b/mimedecode.py
index b82d12f..9aab1b3 100755
--- a/mimedecode.py
+++ b/mimedecode.py
@@ -45,7 +45,6 @@ def output_headers(msg):
 def recode(s, charset):
     return unicode(s, charset, "replace").encode(gopts.default_encoding, "replace")
 
-
 def recode_if_needed(s, charset):
     if charset and charset.lower() <> gopts.default_encoding:
         s = recode(s, charset)
@@ -77,7 +76,6 @@ def _decode_header(s):
     # together into the final string.
     return ''.join(rtn)
 
-
 def decode_header(msg, header):
     "Decode mail header (if exists) and put it back, if it was encoded"
 
@@ -91,7 +89,6 @@ def decode_header(msg, header):
 def _decode_header_param(s):
     return recode_if_needed(s[2], s[0])
 
-
 def decode_header_param(msg, header, param):
     "Decode mail header's parameter (if exists) and put it back, if it was encoded"
 
@@ -381,9 +378,10 @@ if __name__ == "__main__":
     else:
         usage(1, 'Too many arguments')
 
-    if (infile is sys.stdin) and (outfile is sys.stdout) and \
-            sys.stdin.isatty() and sys.stdout.isatty():
-        usage(1, 'Filtering from console to console is forbidden')
+    if (infile is sys.stdin) and sys.stdin.isatty():
+        if (outfile is sys.stdout) and sys.stdout.isatty():
+            usage()
+        usage(1, 'Filtering from console is forbidden')
 
     if not gopts.host_name:
         import socket