Merge pull request #448 from kgaughan/trivial-cleanup

Trivial code cleanup

pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools >= 41"]
 build-backend = "setuptools.build_meta"
 
 [tool.black]
-target-version = ['py35', 'py36', 'py37', 'py38']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 exclude = '''
 /(
   \.git

src/waitress/channel.py

@@ -358,7 +358,7 @@ def write_soon(self, data):
                     raise ClientDisconnected
                 num_bytes = len(data)
 
-                if data.__class__ is ReadOnlyFileBasedBuffer:
+                if isinstance(data, ReadOnlyFileBasedBuffer):
                     # they used wsgi.file_wrapper
                     self.outbufs.append(data)
                     nextbuf = OverflowableBuffer(self.adj.outbuf_overflow)

src/waitress/server.py

@@ -34,7 +34,7 @@ def create_server(
     _start=True,  # test shim
     _sock=None,  # test shim
     _dispatcher=None,  # test shim
-    **kw  # adjustments
+    **kw,  # adjustments
 ):
     """
     if __name__ == '__main__':
@@ -193,7 +193,7 @@ def __init__(
         adj=None,  # adjustments
         sockinfo=None,  # opaque object
         bind_socket=True,
-        **kw
+        **kw,
     ):
         if adj is None:
             adj = Adjustments(**kw)
@@ -387,7 +387,7 @@ def __init__(
             dispatcher=None,  # dispatcher
             adj=None,  # adjustments
             sockinfo=None,  # opaque object
-            **kw
+            **kw,
         ):
             if sockinfo is None:
                 sockinfo = (socket.AF_UNIX, socket.SOCK_STREAM, None, None)

src/waitress/task.py

@@ -13,7 +13,6 @@
 ##############################################################################
 
 from collections import deque
-import socket
 import sys
 import threading
 import time
@@ -389,7 +388,7 @@ def start_response(status, headers, exc_info=None):
 
             self.complete = True
 
-            if status.__class__ is not str:
+            if not isinstance(status, str):
                 raise AssertionError("status %s is not a string" % status)
             if "\n" in status or "\r" in status:
                 raise ValueError(
@@ -400,11 +399,11 @@ def start_response(status, headers, exc_info=None):
 
             # Prepare the headers for output
             for k, v in headers:
-                if k.__class__ is not str:
+                if not isinstance(k, str):
                     raise AssertionError(
                         f"Header name {k!r} is not a string in {(k, v)!r}"
                     )
-                if v.__class__ is not str:
+                if not isinstance(v, str):
                     raise AssertionError(
                         f"Header value {v!r} is not a string in {(k, v)!r}"
                     )
@@ -437,7 +436,7 @@ def start_response(status, headers, exc_info=None):
 
         can_close_app_iter = True
         try:
-            if app_iter.__class__ is ReadOnlyFileBasedBuffer:
+            if isinstance(app_iter, ReadOnlyFileBasedBuffer):
                 cl = self.content_length
                 size = app_iter.prepare(cl)
                 if size:

src/waitress/wasyncore.py

@@ -53,19 +53,14 @@
 
 from errno import (
     EAGAIN,
-    EALREADY,
     EBADF,
     ECONNABORTED,
     ECONNRESET,
-    EINPROGRESS,
     EINTR,
-    EINVAL,
-    EISCONN,
     ENOTCONN,
     EPIPE,
     ESHUTDOWN,
     EWOULDBLOCK,
-    errorcode,
 )
 import logging
 import os
@@ -75,7 +70,7 @@
 import time
 import warnings
 
-from . import compat, utilities
+from . import utilities
 
 _DISCONNECTED = frozenset({ECONNRESET, ENOTCONN, ESHUTDOWN, ECONNABORTED, EPIPE, EBADF})
 

tests/test_adjustments.py

@@ -1,5 +1,4 @@
 import socket
-import sys
 import unittest
 import warnings
 

tests/test_channel.py

@@ -1,8 +1,6 @@
 import io
 import unittest
 
-import pytest
-
 
 class TestHTTPChannel(unittest.TestCase):
     def _makeOne(self, sock, addr, adj, map=None):

tests/test_receiver.py

@@ -178,8 +178,6 @@ def test_received_chunk_not_properly_terminated(self):
         self.assertEqual(inst.error.__class__, BadRequest)
 
     def test_received_multiple_chunks(self):
-        from waitress.utilities import BadRequest
-
         buf = DummyBuffer()
         inst = self._makeOne(buf)
         data = (
@@ -196,13 +194,11 @@ def test_received_multiple_chunks(self):
         )
         result = inst.received(data)
         self.assertEqual(result, len(data))
-        self.assertEqual(inst.completed, True)
+        self.assertTrue(inst.completed)
         self.assertEqual(b"".join(buf.data), b"Wikipedia in\r\n\r\nchunks.")
-        self.assertEqual(inst.error, None)
+        self.assertIsNone(inst.error)
 
     def test_received_multiple_chunks_split(self):
-        from waitress.utilities import BadRequest
-
         buf = DummyBuffer()
         inst = self._makeOne(buf)
         data1 = b"4\r\nWiki\r"
@@ -245,7 +241,7 @@ def test_received_invalid_extensions(self, invalid_extension):
         data = b"4;" + invalid_extension + b"\r\ntest\r\n"
         result = inst.received(data)
         assert result == len(data)
-        assert inst.error.__class__ == BadRequest
+        assert isinstance(inst.error, BadRequest)
         assert inst.error.body == "Invalid chunk extension"
 
     @pytest.mark.parametrize(
@@ -260,7 +256,7 @@ def test_received_valid_extensions(self, valid_extension):
         data = b"4;" + valid_extension + b"\r\ntest\r\n"
         result = inst.received(data)
         assert result == len(data)
-        assert inst.error == None
+        assert inst.error is None
 
     @pytest.mark.parametrize(
         "invalid_size", [b"0x04", b"+0x04", b"x04", b"+04", b" 04", b" 0x04"]
@@ -273,7 +269,7 @@ def test_received_invalid_size(self, invalid_size):
         data = invalid_size + b"\r\ntest\r\n"
         result = inst.received(data)
         assert result == len(data)
-        assert inst.error.__class__ == BadRequest
+        assert isinstance(inst.error, BadRequest)
         assert inst.error.body == "Invalid chunk size"
 
 

tests/test_server.py

@@ -398,7 +398,6 @@ def test_create_with_unix_socket(self):
             from waitress.server import (
                 BaseWSGIServer,
                 MultiSocketServer,
-                TcpWSGIServer,
                 UnixWSGIServer,
             )
 

tests/test_wasyncore.py

@@ -4,7 +4,6 @@
 from errno import EALREADY, EINPROGRESS, EINVAL, EISCONN, EWOULDBLOCK, errorcode
 import functools
 import gc
-from io import BytesIO
 import os
 import re
 import select