Split mimedecode.py into a mimedecode library and a small script

diff --git a/ANNOUNCE b/ANNOUNCE
index 05d783043301a56147c23c71d2716d9c3a283142..198bf470bb264153c9ca1bcb59b7a8aa2c21b584 100644 (file)
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -30,16 +30,18 @@ everything else. This is how it could be done:
    mimedecode.py -t application/pdf -t application/postscript -t text/plain -b text/html -B 'image/*' -i '*/*'
 
 
+Version 2.9.0 (2017-12-??)
+
+   Split mimedecode.py into a mimedecode library and a small script.
+
+   Made the library executable via ``python -m mimedecode``.
+
 Version 2.8.0 (2017-11-03)
 
    Python 3.
 
    Stop supporting Python 2.6.
 
-   Code cleanup: fixed flake8 errors and warnings.
-
-   Pushed to GitHub. Tests at Travis.
-
 
 WHERE TO GET
    Home page: http://phdru.name/Software/Python/#mimedecode

diff --git a/ChangeLog b/ChangeLog
index eeb317c3488cfae3bdfa1dded72042be8edf6294..5ea99362b61aa4abb65ea1e544b78f40efc8b1cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Version 2.9.0 (2017-12-??)
+
+   Split mimedecode.py into a mimedecode library and a small script.
+
+   Moved formatparam_27.py and mimedecode_version.py to the library.
+
+   Made the library executable via ``python -m mimedecode``.
+
+   Renamed mimedecode_version.py to __version__.py.
+
 Version 2.8.0 (2017-11-03)
 
    Python 3.

diff --git a/Makefile.4xslt b/Makefile.4xslt
index 96981a0d0fe571d29adc5c83b9d2304cf8c43963..cea0f13ef58e35e49a2ddff791a980f9a8964adc 100644 (file)
--- a/Makefile.4xslt
+++ b/Makefile.4xslt
@@ -5,7 +5,7 @@ mimedecode.html: mimedecode.docbook Makefile.4xslt
 
 mimedecode.man: mimedecode.docbook Makefile.4xslt
        4xslt $< $(DOCBOOK_XSL)/manpages/docbook.xsl
-       mv mimedecode.py.1 $@
+       mv mimedecode.1 $@
 
 mimedecode.txt: mimedecode.html Makefile.4xslt
        elinks -dump -no-numbering -no-references $< >$@

diff --git a/Makefile.sgmlt b/Makefile.sgmlt
index cadd36f806d55fcb2dbb6f43c5fc8481b244348d..ba8e333db277ce50c37f28e0085c61c1278b5d38 100644 (file)
--- a/Makefile.sgmlt
+++ b/Makefile.sgmlt
@@ -1,6 +1,6 @@
 mimedecode.html: mimedecode.docbook Makefile.sgmlt
        sgmltools -b html $<
-       mv mimedecode/mimedecode.py.html mimedecode.html
+       mv mimedecode/mimedecode.html mimedecode.html
        rmdir mimedecode
 
 mimedecode.man: mimedecode.docbook Makefile.sgmlt

diff --git a/Makefile.xsltproc b/Makefile.xsltproc
index c800f78caa2dabea4f1d2b68188f1f5e642d1496..421f41382b88d73ef1d784d11ac4abdaebcc92cb 100644 (file)
--- a/Makefile.xsltproc
+++ b/Makefile.xsltproc
@@ -5,7 +5,7 @@ mimedecode.html: mimedecode.docbook Makefile.xsltproc
 
 mimedecode.man: mimedecode.docbook Makefile.xsltproc
        xsltproc $(DOCBOOK_XSL)/manpages/docbook.xsl $<
-       mv mimedecode.py.1 $@
+       mv mimedecode.1 $@
 
 mimedecode.txt: mimedecode.html Makefile.xsltproc
        elinks -dump -no-numbering -no-references $< >$@

diff --git a/TODO b/TODO
index e665141d9cfd8c8c645a8edb1ec46fc29ee055af..62aa8620fc15fcc9150536e6783bcc09424a71df 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,11 +1,3 @@
-Split mimedecode.py into a library and a small script.
-Move formatparam_27.py and mimedecode_version.py to the library.
-Rename mimedecode_version.py to __version__.py.
-
-
-Release 2.9.
-
-
 Convert mimedecode.py library from global functions to a class.
 
 

diff --git a/mimedecode.docbook b/mimedecode.docbook
index 0129709532dca754b56d05efe16293cca83f9af3..8da5d2fb78f3c9e6cfb965af704d8be1540efc51 100644 (file)
--- a/mimedecode.docbook
+++ b/mimedecode.docbook
@@ -2,10 +2,10 @@
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
   "file:///usr/share/xml/docbook/schema/dtd/4.5/docbookx.dtd">
 
-<refentry id="mimedecode.py">
+<refentry id="mimedecode">
 
 <refentryinfo>
-  <title>mimedecode.py</title>
+  <title>mimedecode</title>
   <productname>mimedecode.docbook</productname>
   <author>
     <firstname>Oleg</firstname>
@@ -20,18 +20,18 @@
 </refentryinfo>
 
 <refmeta>
-   <refentrytitle>mimedecode.py</refentrytitle>
+   <refentrytitle>mimedecode</refentrytitle>
    <manvolnum>1</manvolnum>
 </refmeta>
 
 <refnamediv>
-   <refname>mimedecode.py</refname>
+   <refname>mimedecode</refname>
    <refpurpose>decode MIME message</refpurpose>
 </refnamediv>
 
 <refsynopsisdiv>
    <cmdsynopsis>
-      <command>mimedecode.py</command>
+      <command>mimedecode</command>
       <arg choice="opt">
          <option>-h|--help</option>
       </arg>
@@ -122,7 +122,7 @@
 </para>
 
 <para>
-   Here is a solution - mimedecode.py!
+   Here is a solution - mimedecode!
 </para>
 
 <para>
@@ -494,8 +494,8 @@
          <para>
             Save output to the file related to the destination directory from
             option -O. Also useful in case of redirected stdin:
-            <programlisting language="sh">mimedecode.py -o output_file &lt; input_file
-cat input_file | mimedecode.py -o output_file</programlisting>
+            <programlisting language="sh">mimedecode -o output_file &lt; input_file
+cat input_file | mimedecode -o output_file</programlisting>
          </para>
       </listitem>
    </varlistentry>
@@ -512,7 +512,7 @@ cat input_file | mimedecode.py -o output_file</programlisting>
 
 <para>
 <code language="sh">
-  mimedecode.py -t application/pdf -t application/postscript -t text/plain
+  mimedecode -t application/pdf -t application/postscript -t text/plain
       -b text/html -B 'image/*' -i '*/*'
 </code>
 </para>
@@ -641,7 +641,7 @@ cat input_file | mimedecode.py -o output_file</programlisting>
 <refsect1>
 <title>SEE ALSO</title>
 <para>
-  mimedecode.py home page:
+  mimedecode home page:
   <ulink url="http://phdru.name/Software/Python/#mimedecode">http://phdru.name/Software/Python/#mimedecode</ulink>
 </para>
 </refsect1>

diff --git a/mimedecode/__init__.py b/mimedecode/__init__.py
new file mode 100644 (file)
index 0000000..792d600
--- /dev/null
+++ b/mimedecode/__init__.py
@@ -0,0 +1 @@
+#

diff --git a/mimedecode/__main__.py b/mimedecode/__main__.py
new file mode 100644 (file)
index 0000000..d41b0c0
--- /dev/null
+++ b/mimedecode/__main__.py
@@ -0,0 +1,4 @@
+from .mimedecode import main
+
+if __name__ == "__main__":
+    main()

diff --git a/mimedecode_version.py b/mimedecode/__version__.py
similarity index 85%
rename from mimedecode_version.py
rename to mimedecode/__version__.py
index 1c7393c6720f85d483f23a23661d033b0ff4e6d4..f5653d05f8261a3d43bf27d2b44c18bc4de2eda8 100644 (file)
--- a/mimedecode_version.py
+++ b/mimedecode/__version__.py
@@ -1,4 +1,4 @@
-__version__ = "2.8.0"
+__version__ = "2.9.0"
 __author__ = "Oleg Broytman <phd@phdru.name>"
 __copyright__ = "Copyright (C) 2001-2017 PhiloSoft Design"
 __license__ = "GNU GPL"

diff --git a/formatparam_27.py b/mimedecode/formatparam_27.py
similarity index 100%
rename from formatparam_27.py
rename to mimedecode/formatparam_27.py

diff --git a/mimedecode.py b/mimedecode/mimedecode.py
similarity index 99%
rename from mimedecode.py
rename to mimedecode/mimedecode.py
index 9019669f150b3ed39c84eeb4f55906e6d3b1e8be..c3d4e0a7a2476b7842dfb7c67429fe6cdabcfd70 100755 (executable)
--- a/mimedecode.py
+++ b/mimedecode/mimedecode.py
@@ -5,12 +5,12 @@ import os
 import subprocess
 import sys
 
-from mimedecode_version import __version__, __copyright__
+from .__version__ import __version__, __copyright__
 
 if sys.version_info[0] >= 3:
     # Replace email.message._formatparam with _formatparam from Python 2.7
     # to avoid re-encoding non-ascii params.
-    import formatparam_27  # noqa: F401: Imported for its side effect
+    from mimedecode import formatparam_27  # noqa: F401: Imported for its side effect
 
 me = os.path.basename(sys.argv[0])
 
@@ -678,7 +678,7 @@ def get_opts():
     return arguments
 
 
-if __name__ == "__main__":
+def main():
     arguments = get_opts()
 
     la = len(arguments)
@@ -725,6 +725,7 @@ if __name__ == "__main__":
         g.host_name = socket.gethostname()
 
     g.outfile = outfile
+    global output
     if hasattr(outfile, 'buffer'):
         def output_bytes(s):
             if not isinstance(s, bytes):
@@ -749,3 +750,7 @@ if __name__ == "__main__":
     finally:
         infile.close()
         outfile.close()
+
+
+if __name__ == "__main__":
+    main()

diff --git a/setup.py b/setup.py
index fcfb53e357dd0a1bf7c4b80123c1ed1f80d925d4..6d51a565598cc2ca332e273c10d3a74e43459aba 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,8 @@
 #! /usr/bin/env python
 
+from imp import load_source
+from os.path import abspath, dirname, join
+
 try:
     from setuptools import setup
     is_setuptools = True
@@ -7,7 +10,9 @@ except ImportError:
     from distutils.core import setup
     is_setuptools = False
 
-from mimedecode_version import __version__, __copyright__, __license__
+versionpath = join(abspath(dirname(__file__)), "mimedecode", "__version__.py")
+load_source("mimedecode_version", versionpath)
+from mimedecode_version import __version__, __copyright__, __license__ # noqa: ignore flake8 E402
 
 kw = {}
 if is_setuptools:
@@ -43,7 +48,11 @@ setup(
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
     ],
-    py_modules=['formatparam_27', 'mimedecode_version'],
-    scripts=['mimedecode.py'],
+    packages=['mimedecode'],
+    entry_points={
+        'console_scripts': [
+            'mimedecode = mimedecode.__main__:main'
+        ]
+    },
     **kw
 )

diff --git a/test/expected-save/msg_07-1.txt b/test/expected-save/msg_07-1.txt
index 0ddf15f29ddbbf0f8902d1b1d6f86e1a72681c1c..e2b14809fb2ad5e8692ee29be5fed2a653471653 100644 (file)
--- a/test/expected-save/msg_07-1.txt
+++ b/test/expected-save/msg_07-1.txt
@@ -1,5 +1,5 @@
 Content-Type: image/gif; name="dingusfish.gif"
 Content-Transfer-Encoding: 8bit
 content-disposition: attachment; filename="dingusfish.gif"
-X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode
 

diff --git a/test/expected-save/msg_07-3.txt b/test/expected-save/msg_07-3.txt
index cc8962b78e115a8135b6190f6517830c6e937b9d..89bed6d4de23a3ec4bf61defd9f932ea666f5fe1 100644 (file)
Binary files a/test/expected-save/msg_07-3.txt and b/test/expected-save/msg_07-3.txt differ

diff --git a/test/expected-save/msg_07-4.txt b/test/expected-save/msg_07-4.txt
index 047192840e2e1aa92113499e30617a2fe938420f..90e022b5505dbbd1ed4bd024402ae377f87edd8c 100644 (file)
Binary files a/test/expected-save/msg_07-4.txt and b/test/expected-save/msg_07-4.txt differ

diff --git a/test/expected/msg_01-1.txt b/test/expected/msg_01-1.txt
index 86498c62887f07c205306930155cd5cdc414a777..6f99b0d87cd3738e57a4da07a4933505d8cb3bdd 100644 (file)
--- a/test/expected/msg_01-1.txt
+++ b/test/expected/msg_01-1.txt
@@ -12,7 +12,7 @@ Date: Fri, 4 May 2001 14:05:44 -0400
 X-Test: set
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_01-2.txt b/test/expected/msg_01-2.txt
index 09c4e43de6af0bc85625962f01342b55b951d637..fe689733000264e1519672c6f6f1f7ef0cd70be0 100644 (file)
--- a/test/expected/msg_01-2.txt
+++ b/test/expected/msg_01-2.txt
@@ -12,7 +12,7 @@ Date: Fri, 4 May 2001 14:05:44 -0400
 X-Test: set; test="set"
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_01.txt b/test/expected/msg_01.txt
index 4a8565ff5b8dbc98eb8350bfb4d03dddb82c8830..8c60f02719df93a6047d84ba3926e46b91d98d7f 100644 (file)
--- a/test/expected/msg_01.txt
+++ b/test/expected/msg_01.txt
@@ -11,7 +11,7 @@ Subject: This is a test message
 Date: Fri, 4 May 2001 14:05:44 -0400
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_02-1.txt b/test/expected/msg_02-1.txt
index f854c3e21093f2190d991c71dec6a61806338d90..f6861428eadc05dca9761ea7e9b5e356d67e6d1a 100644 (file)
--- a/test/expected/msg_02-1.txt
+++ b/test/expected/msg_02-1.txt
@@ -13,7 +13,7 @@ X-Mailer: Mailman v2.0.4; test="set"
 Content-description: Masthead (Ppp digest, Vol 1 #2)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Send Ppp mailing list submissions to
        ppp@zzz.org
@@ -34,7 +34,7 @@ than "Re: Contents of Ppp digest..."
 Content-description: Today's Topics (5 msgs)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Today's Topics:
 
@@ -58,7 +58,7 @@ Subject: [Ppp] testing #1
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -74,7 +74,7 @@ From: barry@digicool.com (Barry A. Warsaw)
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -91,7 +91,7 @@ Subject: [Ppp] testing #3
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -108,7 +108,7 @@ Subject: [Ppp] testing #4
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -125,7 +125,7 @@ Subject: [Ppp] testing #5
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -139,7 +139,7 @@ hello
 Content-description: Digest Footer
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 _______________________________________________
 Ppp mailing list

diff --git a/test/expected/msg_02.txt b/test/expected/msg_02.txt
index f12dd124898c1d1d489a75ca196619cb44cb7956..28d33c70d39078c9a2ba2cc760823ce5313b9f07 100644 (file)
--- a/test/expected/msg_02.txt
+++ b/test/expected/msg_02.txt
@@ -13,7 +13,7 @@ Content-Type: multipart/mixed; boundary="192.168.1.2.889.32614.987812255.500.218
 Content-description: Masthead (Ppp digest, Vol 1 #2)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Send Ppp mailing list submissions to
        ppp@zzz.org
@@ -34,7 +34,7 @@ than "Re: Contents of Ppp digest..."
 Content-description: Today's Topics (5 msgs)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Today's Topics:
 
@@ -58,7 +58,7 @@ Subject: [Ppp] testing #1
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -74,7 +74,7 @@ From: barry@digicool.com (Barry A. Warsaw)
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -91,7 +91,7 @@ Subject: [Ppp] testing #3
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -108,7 +108,7 @@ Subject: [Ppp] testing #4
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -125,7 +125,7 @@ Subject: [Ppp] testing #5
 Precedence: bulk
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 hello
@@ -139,7 +139,7 @@ hello
 Content-description: Digest Footer
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 _______________________________________________
 Ppp mailing list

diff --git a/test/expected/msg_06.txt b/test/expected/msg_06.txt
index 67a0c07c9675060c149323440c55d620d50567e6..e4dd02bdd8034063c5c684cee288790bf9fd2daf 100644 (file)
--- a/test/expected/msg_06.txt
+++ b/test/expected/msg_06.txt
@@ -30,6 +30,6 @@ X-Oblique-Strategy: Spectrum analysis
 X-Url: http://barry.wooz.org
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 

diff --git a/test/expected/msg_07-1.txt b/test/expected/msg_07-1.txt
index 9ed3c2fa6d237c09607e059dd523102cb129d260..f54260dd53ea36db0fe853a0df0045f1a11b50ae 100644 (file)
Binary files a/test/expected/msg_07-1.txt and b/test/expected/msg_07-1.txt differ

diff --git a/test/expected/msg_07.txt b/test/expected/msg_07.txt
index 9cfaa68d524a38bb740cc5398d8f440567cd3881..6fe903a8c57bc1d68a2a921627f242ab8fd9cc9d 100644 (file)
Binary files a/test/expected/msg_07.txt and b/test/expected/msg_07.txt differ

diff --git a/test/expected/msg_08.txt b/test/expected/msg_08.txt
index fd966be0660cc2820db55b1c4d76e9d1c1ddce41..3855827c7eef25035f0602d553a9c82e6ed0f88e 100644 (file)
--- a/test/expected/msg_08.txt
+++ b/test/expected/msg_08.txt
@@ -9,27 +9,27 @@ Content-Type: multipart/mixed; boundary="BOUNDARY"
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 
 
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode
 
 
 --BOUNDARY--

diff --git a/test/expected/msg_09.txt b/test/expected/msg_09.txt
index 8c8d77386bb3a48cf3771796379eb0495789e6de..9fb016383f49d8a83d043c3ac869f56120a9e0cc 100644 (file)
--- a/test/expected/msg_09.txt
+++ b/test/expected/msg_09.txt
@@ -9,14 +9,14 @@ Content-Type: multipart/mixed; boundary="BOUNDARY"
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 
 
@@ -27,7 +27,7 @@ Content-Type: text/plain
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode
 
 
 --BOUNDARY--

diff --git a/test/expected/msg_10.txt b/test/expected/msg_10.txt
index e59a81be03acc57caba8a82ac49afe52f4e64918..b0abcb2b52b247ca12f199d998293ae9f8be9018 100644 (file)
--- a/test/expected/msg_10.txt
+++ b/test/expected/msg_10.txt
@@ -10,42 +10,42 @@ Content-Type: multipart/mixed; boundary="BOUNDARY"
 Content-Transfer-Encoding: 7bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 This is a 7bit encoded message.
 
 --BOUNDARY
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from Quoted-Printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from Quoted-Printable to 8bit by test id mimedecode
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 ¡This is a Quoted Printable encoded message!
 
 
 --BOUNDARY
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from Base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from Base64 to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This is a Base64 encoded message.
 --BOUNDARY
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from Base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from Base64 to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This is a Base64 encoded message.
 
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This has no Content-Transfer-Encoding: header.
 

diff --git a/test/expected/msg_12.txt b/test/expected/msg_12.txt
index e765d019c9d2a856062c709f020d9968669f3cfd..2ff11bc1b07de501da93abc7385e230b7ff8c6f6 100644 (file)
--- a/test/expected/msg_12.txt
+++ b/test/expected/msg_12.txt
@@ -9,14 +9,14 @@ Content-Type: multipart/mixed; boundary="BOUNDARY"
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 
 
@@ -26,13 +26,13 @@ Content-Type: multipart/mixed; boundary="ANOTHER"
 --ANOTHER
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode
 
 
 --ANOTHER
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode
 
 
 --ANOTHER--
@@ -40,13 +40,13 @@ X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode.py
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode
 
 
 --BOUNDARY--

diff --git a/test/expected/msg_12a.txt b/test/expected/msg_12a.txt
index 9d672831999f38bf16fc6bb62269dc5e89f2f7e5..48a21125deb886f5faba817797cb0b81783d80d6 100644 (file)
--- a/test/expected/msg_12a.txt
+++ b/test/expected/msg_12a.txt
@@ -9,14 +9,14 @@ Content-Type: multipart/mixed; boundary="BOUNDARY"
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 
 
@@ -26,13 +26,13 @@ Content-Type: multipart/mixed; boundary="ANOTHER"
 --ANOTHER
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-2 to utf-8 by test id mimedecode
 
 
 --ANOTHER
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode
 
 
 --ANOTHER--
@@ -41,13 +41,13 @@ X-MIME-Autoconverted: from iso-8859-3 to utf-8 by test id mimedecode.py
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 --BOUNDARY
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from koi8-r to utf-8 by test id mimedecode
 
 
 --BOUNDARY--

diff --git a/test/expected/msg_13.txt b/test/expected/msg_13.txt
index 1e0cdf3a254a99bfac47f0c5ae8a3ad961327f8a..baa4d715cb5fe25d002ee3bc950779604573dd8c 100644 (file)
Binary files a/test/expected/msg_13.txt and b/test/expected/msg_13.txt differ

diff --git a/test/expected/msg_14.txt b/test/expected/msg_14.txt
index 70c0e144a7ec8d18dcd31bcecc7b6ff788a5a2b7..c78e45446f2cfd3fc409d1474ed1305754e8e2e3 100644 (file)
--- a/test/expected/msg_14.txt
+++ b/test/expected/msg_14.txt
@@ -11,7 +11,7 @@ Subject: This is a test message
 Date: Fri, 4 May 2001 14:05:44 -0400
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_15-1.txt b/test/expected/msg_15-1.txt
index 272ad4504be9bfa91222ca4e81d15cb4b5276ba1..416e7f6c520b4d8da87bc8f9d3caef1bf5fc876d 100644 (file)
--- a/test/expected/msg_15-1.txt
+++ b/test/expected/msg_15-1.txt
@@ -20,17 +20,17 @@ Content-type: multipart/alternative;
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 Some removed test. 
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-type: text/html; charset="ISO-8859-1"
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 
 <HTML>
 <HEAD>

diff --git a/test/expected/msg_15-2.txt b/test/expected/msg_15-2.txt
index 50d8a05203d7ba71c3a7d7d2672c2b154e2230cf..60e9298b10799076d0cc8648ad13f68a7c5378af 100644 (file)
--- a/test/expected/msg_15-2.txt
+++ b/test/expected/msg_15-2.txt
@@ -20,17 +20,17 @@ Content-type: multipart/alternative;
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 Some removed test. 
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-type: text/html; charset="ISO-8859-1"
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 
 
 Message body of type text/html skipped.

diff --git a/test/expected/msg_15.txt b/test/expected/msg_15.txt
index ae8288fa7ea9d5e9b46b3c9dd649c1c47bcc5c1f..f8461506e112dc1af3b17710e915ce063b4c22ef 100644 (file)
--- a/test/expected/msg_15.txt
+++ b/test/expected/msg_15.txt
@@ -20,20 +20,20 @@ Content-type: multipart/alternative;
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 Some removed test. 
 
 --MS_Mac_OE_3071477847_720252_MIME_Part
 Content-transfer-encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 X-MIME-Autoconverted: from text/html to text/plain by test id ./html2txt.py
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 
 

diff --git a/test/expected/msg_16-1.txt b/test/expected/msg_16-1.txt
index b2e4bb9cfebe894e65a6ae8c8553a5892365aa84..b48f54f1778501b7531a40172ed8dd499d703add 100644 (file)
--- a/test/expected/msg_16-1.txt
+++ b/test/expected/msg_16-1.txt
@@ -18,7 +18,7 @@ Content-Type: multipart/report; boundary="Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)"
 --Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This report relates to a message you sent with the following header fields:
 
@@ -67,7 +67,7 @@ X-BeenThere: scr@socal-raves.org
 X-Mailman-Version: 2.1a3
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 I always love to find more Ian's that are over 3 years old!!
 

diff --git a/test/expected/msg_16-2.txt b/test/expected/msg_16-2.txt
index 7daa4f5f54910fd971daa5a0d14525461bfafea1..e060db18b63603d45437408e652283df0445c856 100644 (file)
--- a/test/expected/msg_16-2.txt
+++ b/test/expected/msg_16-2.txt
@@ -6,7 +6,7 @@ Content-Type: multipart/report; boundary="Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)"
 --Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This report relates to a message you sent with the following header fields:
 
@@ -33,7 +33,7 @@ Content-type: MESSAGE/RFC822
 
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 I always love to find more Ian's that are over 3 years old!!
 

diff --git a/test/expected/msg_16.txt b/test/expected/msg_16.txt
index e5336011688e86c74844dbe86c0d5aa86127c29d..0d593fed06a511664a90d3eae449d5e565ae5e43 100644 (file)
--- a/test/expected/msg_16.txt
+++ b/test/expected/msg_16.txt
@@ -36,7 +36,7 @@ Content-Type: multipart/report; boundary="Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)"
 --Boundary_(ID_PGS2F2a+z+/jL7hupKgRhA)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-1 to utf-8 by test id mimedecode
 
 This report relates to a message you sent with the following header fields:
 
@@ -114,7 +114,7 @@ List-Unsubscribe: <http://socal-raves.org/mailman/listinfo/scr>,
 List-Archive: <http://socal-raves.org/mailman/private/scr/>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 I always love to find more Ian's that are over 3 years old!!
 

diff --git a/test/expected/msg_18-1.txt b/test/expected/msg_18-1.txt
index 28af17dde99aeef1b3fdeef832432b81991d5822..01898fa94204deb5f791ebd82ce79eb7c066559c 100644 (file)
--- a/test/expected/msg_18-1.txt
+++ b/test/expected/msg_18-1.txt
@@ -3,5 +3,5 @@ Content-Transfer-Encoding: 7bit
 X-Foobar-Spoink-Defrobnit: wasnipoop
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 

diff --git a/test/expected/msg_18.txt b/test/expected/msg_18.txt
index b3808853bd1b4d37a1a32989bd1112101a014f33..2af15eba56b700c727770d07b224ada1645a8494 100644 (file)
--- a/test/expected/msg_18.txt
+++ b/test/expected/msg_18.txt
@@ -4,5 +4,5 @@ X-Foobar-Spoink-Defrobnit: wasnipoop; giraffes="very-long-necked-animals";
        spooge="yummy"; hippos="gargantuan"; marshmallows="gooey"
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 

diff --git a/test/expected/msg_20.txt b/test/expected/msg_20.txt
index 3ea86f26c4bca4bcec6909342d869d73b14ef6bd..45912f470927e948bd1bc6b7ba571674c517282b 100644 (file)
--- a/test/expected/msg_20.txt
+++ b/test/expected/msg_20.txt
@@ -14,7 +14,7 @@ Subject: This is a test message
 Date: Fri, 4 May 2001 14:05:44 -0400
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_21.txt b/test/expected/msg_21.txt
index 3827163d8ed44807144460e22873bcd95e3efb1e..c69cae7cd69d2fca26062bb65412ce29d60c24e6 100644 (file)
--- a/test/expected/msg_21.txt
+++ b/test/expected/msg_21.txt
@@ -9,14 +9,14 @@ MIME message
 Content-Transfer-Encoding: 7bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 One
 --BOUNDARY
 Content-Transfer-Encoding: 7bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Two
 --BOUNDARY--

diff --git a/test/expected/msg_22-1.txt b/test/expected/msg_22-1.txt
index 1545c7302a6547d4d460a171936292f396c2c66f..f16cc48c36c2ecc6556b3c76121bb80ee80ca0d7 100644 (file)
Binary files a/test/expected/msg_22-1.txt and b/test/expected/msg_22-1.txt differ

diff --git a/test/expected/msg_22.txt b/test/expected/msg_22.txt
index 0caea80e2ff2a8e079d5be24dc47d44eea496531..03354950b92e4192a47c5168632de58471f07468 100644 (file)
Binary files a/test/expected/msg_22.txt and b/test/expected/msg_22.txt differ

diff --git a/test/expected/msg_26.txt b/test/expected/msg_26.txt
index 16b74b55f8935ec1c220cc1f66f0732e79c5d463..1c97140d490b4c8f849aa3e225f3e08b4e5a9f85 100644 (file)
Binary files a/test/expected/msg_26.txt and b/test/expected/msg_26.txt differ

diff --git a/test/expected/msg_26.txt-py3 b/test/expected/msg_26.txt-py3
index bf2880234a3a392432574a073232266b4bfb3c15..f07ea9264c336782fe75a328603e3dfcc579d4db 100644 (file)
Binary files a/test/expected/msg_26.txt-py3 and b/test/expected/msg_26.txt-py3 differ

diff --git a/test/expected/msg_27.txt b/test/expected/msg_27.txt
index 4d29f508bafd3a3ab4abc52b3fc7307a24c9d321..58f87ed9982c3a75768bdab557b31e7c8c497c8e 100644 (file)
--- a/test/expected/msg_27.txt
+++ b/test/expected/msg_27.txt
@@ -12,6 +12,6 @@ From: aperson@dom.ain (Anne P. Erson)
 To: bperson@dom.ain (Barney P. Erson)
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 test

diff --git a/test/expected/msg_28.txt b/test/expected/msg_28.txt
index 3c6ae18203d3bc66f62b79ba47ee4e023b486e57..28c0768ad2daff66ab71478dcd99a7c10c012fdc 100644 (file)
--- a/test/expected/msg_28.txt
+++ b/test/expected/msg_28.txt
@@ -11,7 +11,7 @@ From: cc@dd.org
 Subject: ee
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 message 1
 
@@ -23,7 +23,7 @@ From: cc@dd.org
 Subject: ee
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 message 2
 

diff --git a/test/expected/msg_29-1.txt b/test/expected/msg_29-1.txt
index 4a8565ff5b8dbc98eb8350bfb4d03dddb82c8830..8c60f02719df93a6047d84ba3926e46b91d98d7f 100644 (file)
--- a/test/expected/msg_29-1.txt
+++ b/test/expected/msg_29-1.txt
@@ -11,7 +11,7 @@ Subject: This is a test message
 Date: Fri, 4 May 2001 14:05:44 -0400
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_29.txt b/test/expected/msg_29.txt
index 28100c07d5b03bc37df89d00aabc939cc74fd9d3..95ed31c22d4db7aea67f2d23bdc80c163885edb6 100644 (file)
--- a/test/expected/msg_29.txt
+++ b/test/expected/msg_29.txt
@@ -11,7 +11,7 @@ Subject: This is a test message
 Date: Fri, 4 May 2001 14:05:44 -0400
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"; title*="us-ascii'en'This%20is%20even%20more%20%2A%2A%2Afun%2A%2A%2A%20isn%27t%20it%21"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 
 Hi,

diff --git a/test/expected/msg_30.txt b/test/expected/msg_30.txt
index d75a444815a3a8db49236673c52e46d24b0ff06c..8981d2fdefc3f438e2cd4a2c82de325956bbf557 100644 (file)
--- a/test/expected/msg_30.txt
+++ b/test/expected/msg_30.txt
@@ -10,7 +10,7 @@ From: cc@dd.org
 Subject: ee
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 message 1
 
@@ -21,7 +21,7 @@ From: cc@dd.org
 Subject: ee
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 message 2
 

diff --git a/test/expected/msg_32.txt b/test/expected/msg_32.txt
index 9fdf81377791813dc53129f8ef0c15f36b174a01..42f4820658969c17f09f7cfaefff715856b724fe 100644 (file)
--- a/test/expected/msg_32.txt
+++ b/test/expected/msg_32.txt
@@ -11,6 +11,6 @@ Precedence: bulk
 X-Loop: FreeBSD.org
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 Some message.

diff --git a/test/expected/msg_33.txt b/test/expected/msg_33.txt
index b284caa5bab028b8307d76c82af1bb43593d9052..e178f5ae9dc77c67f84014afd481738340f537d9 100644 (file)
--- a/test/expected/msg_33.txt
+++ b/test/expected/msg_33.txt
@@ -17,10 +17,10 @@ X-Loop: FreeBSD.org
 --EeQfGwPcQSOJBaQU
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from quoted-printable to 8bit by test id mimedecode
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 part 1
 

diff --git a/test/expected/msg_38.txt b/test/expected/msg_38.txt
index a56a754019bda447df14207b1fb36fecbf0e3958..28a4d636affc770b523b4a75052d2fce62231c32 100644 (file)
--- a/test/expected/msg_38.txt
+++ b/test/expected/msg_38.txt
@@ -102,7 +102,7 @@ XXX
 Content-ID: <20592.1022586929.15@example.com>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 --
 It's never too late to have a happy childhood.

diff --git a/test/expected/msg_39.txt b/test/expected/msg_39.txt
index 9c99abdbc6871bc5aa63c9224c167e7ff876abb8..32bb20d0695cb88f9243ba898b6a5c90383a6dd2 100644 (file)
--- a/test/expected/msg_39.txt
+++ b/test/expected/msg_39.txt
@@ -16,7 +16,7 @@ Content-Type: application/octet-stream
 Content-ID: <20592.1022586929.3@example.com>
 Content-Description: patch1
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode
 
 XXX
 
@@ -25,7 +25,7 @@ Content-Type: application/octet-stream
 Content-ID: <20592.1022586929.4@example.com>
 Content-Description: patch2
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode
 
 XXX
 
@@ -81,7 +81,7 @@ XXX
 Content-ID: <20592.1022586929.15@example.com>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 --
 It's never too late to have a happy childhood.

diff --git a/test/expected/msg_39.txt-py3 b/test/expected/msg_39.txt-py3
index 5866bf7b9b01721257bd2c895951420377ddc92c..5dc16d493c1b51fc59a1541d81822be3590e3144 100644 (file)
--- a/test/expected/msg_39.txt-py3
+++ b/test/expected/msg_39.txt-py3
@@ -16,7 +16,7 @@ Content-Type: application/octet-stream
 Content-ID: <20592.1022586929.3@example.com>
 Content-Description: patch1
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode
 
 ]u
 ------- =_aaaaaaaaaa1
@@ -24,7 +24,7 @@ Content-Type: application/octet-stream
 Content-ID: <20592.1022586929.4@example.com>
 Content-Description: patch2
 Content-Transfer-Encoding: 8bit
-X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode.py
+X-MIME-Autoconverted: from base64 to 8bit by test id mimedecode
 
 ]u
 ------- =_aaaaaaaaaa1--
@@ -79,7 +79,7 @@ XXX
 Content-ID: <20592.1022586929.15@example.com>
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from us-ascii to utf-8 by test id mimedecode
 
 --
 It's never too late to have a happy childhood.

diff --git a/test/expected/msg_46.txt b/test/expected/msg_46.txt
index 0260b99ec29b093f6264a8aafc335607c2531e04..5f1ae5a898c048a7b9ff202952f92036d48f2112 100644 (file)
--- a/test/expected/msg_46.txt
+++ b/test/expected/msg_46.txt
@@ -20,6 +20,6 @@ Subject: GroupwiseForwardingTest
 Content-Transfer-Encoding: 7bit
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
-X-MIME-Autoconverted: from iso-8859-15 to utf-8 by test id mimedecode.py
+X-MIME-Autoconverted: from iso-8859-15 to utf-8 by test id mimedecode
 
 Testing email forwarding with Groupwise 1.2.2010

diff --git a/test/test_all b/test/test_all
index 1074273b44cc78328a437ac1fb10cfc306872b1f..02329d56776fd37631558e53aab9dab50ad1a5b5 100755 (executable)
--- a/test/test_all
+++ b/test/test_all
@@ -30,7 +30,7 @@ test1() {
    fi
    shift
 
-   $PYTHON ../mimedecode.py -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
+   mimedecode -H test -f utf-8 "$@" input/"$infile" >tmp/"$expfile" || return 1
    if cmp -s expected/"$expfile" tmp/"$expfile"; then
       rm tmp/"$expfile" && return 0 || return 1
    else