diff options
Diffstat (limited to 'libpathod/pathoc_cmdline.py')
-rw-r--r-- | libpathod/pathoc_cmdline.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libpathod/pathoc_cmdline.py b/libpathod/pathoc_cmdline.py index 02eb6e5d..5722a24f 100644 --- a/libpathod/pathoc_cmdline.py +++ b/libpathod/pathoc_cmdline.py @@ -1,9 +1,9 @@ -#!/usr/bin/env python import sys import argparse import os import os.path -from netlib import http_uastrings + +from netlib import http_uastrings, tcp from . import pathoc, version, utils, language @@ -108,10 +108,11 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr): help="SSL cipher specification" ) group.add_argument( - "--sslversion", dest="sslversion", type=str, default='SSLv23', - choices=utils.SSLVERSIONS.keys(), + "--ssl-version", dest="ssl_version", type=str, default=tcp.SSL_DEFAULT_VERSION, + choices=tcp.SSL_VERSIONS.keys(), help="""" - Use a specified protocol - TLSv1.2, TLSv1.1, TLSv1, SSLv3, SSLv2, SSLv23. + Use a specified protocol: + TLSv1.2, TLSv1.1, TLSv1, SSLv3, SSLv2, SSLv23. Default to SSLv23.""" ) @@ -161,6 +162,8 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr): args = parser.parse_args(argv[1:]) + args.ssl_version = tcp.SSL_VERSIONS[args.ssl_version] + args.port = None if ":" in args.host: h, p = args.host.rsplit(":", 1) @@ -215,6 +218,7 @@ def args_pathoc(argv, stdout=sys.stdout, stderr=sys.stderr): print >> stderr, v.marked() sys.exit(1) args.requests = reqs + return args |