Mercurial > libervia-web

changeset 1366:f61e95438050

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server: don't encode options help messages, this is not needed anymore since we moved to Python 3
author Goffi <goffi@goffi.org>
date Fri, 20 Nov 2020 17:55:21 +0100
parents 10517a8698ca
children ce5cfe004d4e
files twisted/plugins/libervia_server.py
diffstat 1 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/twisted/plugins/libervia_server.py	Fri Nov 20 17:53:38 2020 +0100
+++ b/twisted/plugins/libervia_server.py	Fri Nov 20 17:55:21 2020 +0100
@@ -104,34 +104,35 @@
 # options which are in sat.conf and on command line,
 # see https://twistedmatrix.com/documents/current/api/twisted.python.usage.Options.html
 OPT_PARAMETERS_BOTH = [['connection_type', 't', 'https', _("'http', 'https' or 'both' "
-                        "(to launch both servers).").encode('utf-8'),
+                        "(to launch both servers)."),
                         coerceConnectionType],
                        ['port', 'p', 8080,
-                        _('The port number to listen HTTP on.').encode('utf-8'), int],
+                        _('The port number to listen HTTP on.'), int],
                        ['port_https', 's', 8443,
-                        _('The port number to listen HTTPS on.').encode('utf-8'), int],
+                        _('The port number to listen HTTPS on.'), int],
                        ['port_https_ext', 'e', 0, _('The external port number used for '
-                        'HTTPS (0 means port_https value).').encode('utf-8'), int],
+                        'HTTPS (0 means port_https value).'), int],
                        ['tls_private_key', '', '', _('TLS certificate private key (PEM '
-                        'format)').encode('utf-8'), coerceUnicode],
+                        'format)'), coerceUnicode],
                        ['tls_certificate', 'c', 'libervia.pem', _('TLS public '
                         'certificate or private key and public certificate combined '
-                        '(PEM format)').encode('utf-8'), coerceUnicode],
+                        '(PEM format)'), coerceUnicode],
                        ['tls_chain', '', '', _('TLS certificate intermediate chain (PEM '
-                        'format)').encode('utf-8'), coerceUnicode],
+                        'format)'), coerceUnicode],
                        ['redirect_to_https', 'r', True, _('Automatically redirect from '
-                        'HTTP to HTTPS.').encode('utf-8'), coerceBool],
+                        'HTTP to HTTPS.'), coerceBool],
                        ['security_warning', 'w', True, _('Warn user that he is about to '
-                        'connect on HTTP.').encode('utf-8'), coerceBool],
+                        'connect on HTTP.'), coerceBool],
                        ['passphrase', 'k', '', (_("Passphrase for the SàT profile "
-                        "named '%s'") % C.SERVICE_PROFILE).encode('utf-8'),
+                        "named '%s'") % C.SERVICE_PROFILE),
                         coerceUnicode],
                        ['allow_registration', '', True, _('Allow user to register new '
-                        'account').encode('utf-8'), coerceBool],
+                        'account'), coerceBool],
                        ['base_url_ext', '', '',
-                        _('The external URL to use as base URL').encode('utf-8'),
+                        _('The external URL to use as base URL'),
                         coerceUnicode],
                       ]
+
 # Options which are in sat.conf only
 OPT_PARAMETERS_CFG = [
     ["empty_password_allowed_warning_dangerous_list", None, "", None],