From cd293ecf5dd478afd69f05ff35739240120780b1 Mon Sep 17 00:00:00 2001 From: ASPP Student Date: Mon, 3 Sep 2018 12:50:16 +0200 Subject: [PATCH 1/2] Removed option -e to change encoding. Always use default utf-8. --- massmail | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/massmail b/massmail index 87a9615..d681c84 100755 --- a/massmail +++ b/massmail @@ -53,11 +53,6 @@ Options: -s SEPARATOR set field separator in parameter file, default: ";" - -e ENCODING set PARAMETER_FILE *and* BODY character set - encoding, default: "UTF-8". Note that if you fuck - up this one, your email will be full of rubbish: - You have been warned! - -f fake run: don't really send emails, just print to standard output what would be done. Don't be scared if you can not read the body: it is base64 encoded @@ -122,7 +117,7 @@ def parse_command_line_options(arguments): Arguments are checked for validity. """ try: - opts, args = getopt.getopt(arguments, "hfs:F:S:B:R:e:u:p:P:z:") + opts, args = getopt.getopt(arguments, "hfs:F:S:B:R:u:p:P:z:") except getopt.GetoptError as err: error(str(err)+USAGE) @@ -142,8 +137,6 @@ def parse_command_line_options(arguments): } for option, value in opts: - if option == "-e": - options['encoding'] = value if option == "-s": options['sep'] = value elif option == "-F": From f9838135f4e2e024a94f6afd3cc793c9dcb53757 Mon Sep 17 00:00:00 2001 From: ASPP Student Date: Mon, 3 Sep 2018 13:04:23 +0200 Subject: [PATCH 2/2] Fixed error in test. --- test_sending.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test_sending.py b/test_sending.py index d6cf503..ae2d89d 100644 --- a/test_sending.py +++ b/test_sending.py @@ -58,7 +58,6 @@ def test_local_sending(): '-F', email_from, '-S', email_subject, '-z', 'localhost', - '-e', email_encoding, f.name ] options = massmail.parse_command_line_options(cmd_options)