From 1a54f0de471da3a6ec4353fe76b9b9359878c4dc Mon Sep 17 00:00:00 2001 From: Matthias Date: Mon, 4 Apr 2022 09:24:18 +0200 Subject: [PATCH] Rename subprocess module to avoid clash with stdlib (#1438) * Rename subprocess module to avoid clash with stdlib Same problem as with #1426 and logging Signed-off-by: Matthias Binzer * Fix import ordering --- setup.cfg | 2 +- uvicorn/{subprocess.py => _subprocess.py} | 0 uvicorn/supervisors/basereload.py | 2 +- uvicorn/supervisors/multiprocess.py | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename uvicorn/{subprocess.py => _subprocess.py} (100%) diff --git a/setup.cfg b/setup.cfg index 4f7f6359e..314f24b3c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -33,7 +33,7 @@ files = uvicorn/server.py, uvicorn/__init__.py, uvicorn/__main__.py, - uvicorn/subprocess.py, + uvicorn/_subprocess.py, uvicorn/protocols/http/flow_control.py, uvicorn/supervisors/statreload.py, uvicorn/supervisors/multiprocess.py, diff --git a/uvicorn/subprocess.py b/uvicorn/_subprocess.py similarity index 100% rename from uvicorn/subprocess.py rename to uvicorn/_subprocess.py diff --git a/uvicorn/supervisors/basereload.py b/uvicorn/supervisors/basereload.py index 679f2df25..a3f52f824 100644 --- a/uvicorn/supervisors/basereload.py +++ b/uvicorn/supervisors/basereload.py @@ -8,8 +8,8 @@ import click +from uvicorn._subprocess import get_subprocess from uvicorn.config import Config -from uvicorn.subprocess import get_subprocess HANDLED_SIGNALS = ( signal.SIGINT, # Unix signal 2. Sent by Ctrl+C. diff --git a/uvicorn/supervisors/multiprocess.py b/uvicorn/supervisors/multiprocess.py index ee86f8e51..76416c2fd 100644 --- a/uvicorn/supervisors/multiprocess.py +++ b/uvicorn/supervisors/multiprocess.py @@ -9,8 +9,8 @@ import click +from uvicorn._subprocess import get_subprocess from uvicorn.config import Config -from uvicorn.subprocess import get_subprocess HANDLED_SIGNALS = ( signal.SIGINT, # Unix signal 2. Sent by Ctrl+C.