From 1cd9432e25ef6860819913f26771bbdf234c3c42 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Wed, 26 May 2021 15:13:15 +0200 Subject: [PATCH] email options: remove short options to avoid conflict --- mylib/scripts/helpers.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mylib/scripts/helpers.py b/mylib/scripts/helpers.py index 59bfbca..d9f0a93 100644 --- a/mylib/scripts/helpers.py +++ b/mylib/scripts/helpers.py @@ -115,7 +115,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-H', '--smtp-host', + '--smtp-host', action="store", type=str, dest="email_smtp_host", @@ -124,7 +124,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-P', '--smtp-port', + '--smtp-port', action="store", type=int, dest="email_smtp_port", @@ -133,7 +133,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-S', '--smtp-ssl', + '--smtp-ssl', action="store_true", dest="email_smtp_ssl", help="Use SSL (default: %s)" % get_default_opt_value(config, default_config, 'smtp_ssl'), @@ -141,7 +141,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-T', '--smtp-tls', + '--smtp-tls', action="store_true", dest="email_smtp_tls", help="Use TLS (default: %s)" % get_default_opt_value(config, default_config, 'smtp_tls'), @@ -149,7 +149,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-u', '--smtp-user', + '--smtp-user', action="store", type=str, dest="email_smtp_user", @@ -158,7 +158,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-p', '--smtp-password', + '--smtp-password', action="store", type=str, dest="email_smtp_password", @@ -167,7 +167,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-D', '--smtp-debug', + '--smtp-debug', action="store_true", dest="email_smtp_debug", help="Debug SMTP connection (default: %s)" % get_default_opt_value(config, default_config, 'smtp_debug'), @@ -175,7 +175,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-e', '--email-encoding', + '--email-encoding', action="store", type=str, dest="email_encoding", @@ -184,7 +184,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-f', '--sender-name', + '--sender-name', action="store", type=str, dest="email_sender_name", @@ -193,7 +193,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-F', '--sender-email', + '--sender-email', action="store", type=str, dest="email_sender_email", @@ -202,7 +202,7 @@ def add_email_opts(parser, config=None): ) email_opts.add_argument( - '-c', '--catch-all', + '--catch-all', action="store", type=str, dest="email_catch_all",