diff --git a/wsgidav/server/server_cli.py b/wsgidav/server/server_cli.py index ba7400b..7c46061 100644 --- a/wsgidav/server/server_cli.py +++ b/wsgidav/server/server_cli.py @@ -228,7 +228,7 @@ def _init_command_line_options(): del args.quiet if args.root_path and not os.path.isdir(args.root_path): - msg = "{} is not a directory".format(args.root_path) + msg = f"{args.root_path} is not a directory" parser.error(msg) if args.version: @@ -239,9 +239,9 @@ def _init_command_line_options(): "64" if sys.maxsize > 2**32 else "32", platform.platform(aliased=True), ) - version_info += "\nPython from: {}".format(sys.executable) + version_info += f"\nPython from: {sys.executable}" else: - version_info = "{}".format(__version__) + version_info = f"{__version__}" print(version_info) sys.exit() @@ -254,7 +254,7 @@ def _init_command_line_options(): defPath = os.path.abspath(filename) if os.path.exists(defPath): if args.verbose >= 3: - print("Using default configuration file: {}".format(defPath)) + print(f"Using default configuration file: {defPath}") args.config_file = defPath break else: @@ -429,6 +429,7 @@ def _init_config(): if config["suppress_version_info"]: util.public_wsgidav_info = "WsgiDAV" + util.public_python_info = f"Python/{sys.version_info[0]}" return cli_opts, config @@ -443,7 +444,7 @@ def _run_cheroot(app, config, _server): return False version = ( - f"{util.public_wsgidav_info} {wsgi.Server.version} Python/{util.PYTHON_VERSION}" + f"{util.public_wsgidav_info} {wsgi.Server.version} {util.public_python_info}" ) # wsgi.Server.version = version @@ -535,7 +536,7 @@ def _run_gevent(app, config, server): info = _get_common_info(config) version = f"gevent/{gevent.__version__}" - version = f"{util.public_wsgidav_info} {version} Python {util.PYTHON_VERSION}" + version = f"{util.public_wsgidav_info} {version} {util.public_python_info}" # Override or add custom args server_args = { @@ -630,7 +631,7 @@ def load(self): server_args.update(custom_args) version = f"gunicorn/{gunicorn.__version__}" - version = f"{util.public_wsgidav_info} {version} Python {util.PYTHON_VERSION}" + version = f"{util.public_wsgidav_info} {version} {util.public_python_info}" _logger.info(f"Running {version} ...") GunicornApplication(app, server_args).run() @@ -653,7 +654,7 @@ def _run_paste(app, config, server): info = _get_common_info(config) version = httpserver.WSGIHandler.server_version - version = f"{util.public_wsgidav_info} {version} Python {util.PYTHON_VERSION}" + version = f"{util.public_wsgidav_info} {version} {util.public_python_info}" # See http://pythonpaste.org/modules/httpserver.html for more options server = httpserver.serve( @@ -727,7 +728,7 @@ def _run_uvicorn(app, config, server): server_args.update(custom_args) version = f"uvicorn/{uvicorn.__version__}" - version = f"{util.public_wsgidav_info} {version} Python {util.PYTHON_VERSION}" + version = f"{util.public_wsgidav_info} {version} {util.public_python_info}" _logger.info(f"Running {version} ...") uvicorn.run(app, **server_args) @@ -738,7 +739,7 @@ def _run_wsgiref(app, config, _server): from wsgiref.simple_server import WSGIRequestHandler, make_server version = WSGIRequestHandler.server_version - version = f"{util.public_wsgidav_info} {version}" # Python {util.PYTHON_VERSION}" + version = f"{util.public_wsgidav_info} {version}" # {util.public_python_info}" _logger.info(f"Running {version} ...") _logger.warning( diff --git a/wsgidav/server/server_sample.py b/wsgidav/server/server_sample.py index 674662a..8326daf 100644 --- a/wsgidav/server/server_sample.py +++ b/wsgidav/server/server_sample.py @@ -36,7 +36,7 @@ def main(): # For an example, use cheroot: version = ( - f"{util.public_wsgidav_info} {wsgi.Server.version} Python/{util.PYTHON_VERSION}" + f"{util.public_wsgidav_info} {wsgi.Server.version} {util.public_python_info}" ) server = wsgi.Server( diff --git a/wsgidav/util.py b/wsgidav/util.py index dbae2f1..88d6ce5 100644 --- a/wsgidav/util.py +++ b/wsgidav/util.py @@ -55,6 +55,9 @@ #: This is reset to ``"WsgiDAV"`` if ``suppress_version_info`` is set in the #: configuration. public_wsgidav_info = f"WsgiDAV/{__version__}" +#: This is reset to ``"Python/3"`` if ``suppress_version_info`` is set in the +#: configuration. +public_python_info = f"Python/{PYTHON_VERSION}" class NO_DEFAULT: diff --git a/wsgidav/wsgidav_app.py b/wsgidav/wsgidav_app.py index b3a5c79..d2c219d 100644 --- a/wsgidav/wsgidav_app.py +++ b/wsgidav/wsgidav_app.py @@ -54,7 +54,7 @@ import time from urllib.parse import unquote -from wsgidav import util +from wsgidav import __version__, util from wsgidav.dav_provider import DAVProvider from wsgidav.default_conf import DEFAULT_CONFIG from wsgidav.fs_dav_provider import FilesystemProvider @@ -278,8 +278,8 @@ def __init__(self, config): _logger.error("Could not add middleware {}.".format(mw)) _logger.info( - "{} Python/{} {}".format( - util.public_wsgidav_info, + "WsgiDAV/{} Python/{} {}".format( + __version__, util.PYTHON_VERSION, platform.platform(aliased=True), )