diff --git a/gunicorn/dirty/arbiter.py b/gunicorn/dirty/arbiter.py index b867ed18..bfeaab82 100644 --- a/gunicorn/dirty/arbiter.py +++ b/gunicorn/dirty/arbiter.py @@ -16,7 +16,6 @@ import signal import sys import tempfile import time -import traceback from gunicorn import util @@ -357,7 +356,7 @@ class DirtyArbiter: sys.exit(0) except SystemExit: raise - except Exception as e: + except Exception: self.log.exception("Exception in dirty worker process") if not worker.booted: sys.exit(self.WORKER_BOOT_ERROR) diff --git a/gunicorn/dirty/client.py b/gunicorn/dirty/client.py index bed3a3ce..39eac4b1 100644 --- a/gunicorn/dirty/client.py +++ b/gunicorn/dirty/client.py @@ -125,7 +125,7 @@ class DirtyClient: except socket.timeout: self._close_socket() raise DirtyTimeoutError( - f"Timeout waiting for dirty app response", + "Timeout waiting for dirty app response", timeout=self.timeout ) except Exception as e: @@ -238,7 +238,7 @@ class DirtyClient: except asyncio.TimeoutError: await self._close_async() raise DirtyTimeoutError( - f"Timeout waiting for dirty app response", + "Timeout waiting for dirty app response", timeout=self.timeout ) except Exception as e: diff --git a/gunicorn/dirty/worker.py b/gunicorn/dirty/worker.py index ab607bc6..b7797fb8 100644 --- a/gunicorn/dirty/worker.py +++ b/gunicorn/dirty/worker.py @@ -12,7 +12,6 @@ from the DirtyArbiter. import asyncio import os import signal -import sys import traceback import uuid @@ -214,7 +213,6 @@ class DirtyWorker: Each connection can send multiple requests. """ - addr = writer.get_extra_info('peername') self.log.debug("New connection from arbiter") try: diff --git a/tests/test_dirty_client.py b/tests/test_dirty_client.py index 5876be32..89e58805 100644 --- a/tests/test_dirty_client.py +++ b/tests/test_dirty_client.py @@ -4,7 +4,6 @@ """Tests for dirty client module.""" -import asyncio import os import socket import tempfile @@ -17,7 +16,6 @@ from gunicorn.dirty.client import ( get_dirty_socket_path, set_dirty_socket_path, close_dirty_client, - _thread_local, ) from gunicorn.dirty.errors import DirtyConnectionError, DirtyError from gunicorn.dirty.protocol import DirtyProtocol, make_response diff --git a/tests/test_dirty_integration.py b/tests/test_dirty_integration.py index 6a8b263f..6e9d0bd3 100644 --- a/tests/test_dirty_integration.py +++ b/tests/test_dirty_integration.py @@ -155,7 +155,6 @@ class TestDirtyExecutionTimeout: import tempfile from gunicorn.dirty.arbiter import DirtyArbiter from gunicorn.dirty.protocol import DirtyProtocol, make_request - from gunicorn.dirty.errors import DirtyTimeoutError class MockLog: def debug(self, *a, **kw): pass diff --git a/tests/test_dirty_protocol.py b/tests/test_dirty_protocol.py index e2ac3f85..7ea0da14 100644 --- a/tests/test_dirty_protocol.py +++ b/tests/test_dirty_protocol.py @@ -5,6 +5,7 @@ """Tests for dirty arbiter protocol module.""" import asyncio +import os import socket import struct import pytest @@ -183,7 +184,7 @@ class TestDirtyProtocolAsync: read_fd, write_fd = os.pipe() try: reader = asyncio.StreamReader() - protocol = asyncio.StreamReaderProtocol(reader) + _ = asyncio.StreamReaderProtocol(reader) # Write the message to the pipe encoded = DirtyProtocol.encode(message) @@ -369,7 +370,3 @@ class TestDirtyErrors: assert error.action == "run" assert error.traceback == "Traceback..." assert "myapp:App" in str(error) - - -# Add import needed for async tests -import os diff --git a/tests/test_dirty_worker.py b/tests/test_dirty_worker.py index 68d92a0c..1e45629f 100644 --- a/tests/test_dirty_worker.py +++ b/tests/test_dirty_worker.py @@ -662,8 +662,6 @@ class TestDirtyWorkerRunAsync: reader.feed_data(encoded_request) reader.feed_eof() - responses = [] - class MockWriter: def __init__(self): self.closed = False