Remove object from class definition

20 files changed, 67 insertions, 67 deletions

diff --git a/src/waitress/adjustments.py b/src/waitress/adjustments.py
index 93439ea..fb3233d 100644
--- a/src/waitress/adjustments.py
+++ b/src/waitress/adjustments.py
@@ -100,11 +100,11 @@ class _int_marker(int):
     pass
 
 
-class _bool_marker(object):
+class _bool_marker:
     pass
 
 
-class Adjustments(object):
+class Adjustments:
     """This class contains tunable parameters.
     """
 
diff --git a/src/waitress/buffers.py b/src/waitress/buffers.py
index 04f6b42..0086fe8 100644
--- a/src/waitress/buffers.py
+++ b/src/waitress/buffers.py
@@ -22,7 +22,7 @@ COPY_BYTES = 1 << 18  # 256K
 STRBUF_LIMIT = 8192
 
 
-class FileBasedBuffer(object):
+class FileBasedBuffer:
 
     remain = 0
 
@@ -187,7 +187,7 @@ class ReadOnlyFileBasedBuffer(FileBasedBuffer):
         raise NotImplementedError
 
 
-class OverflowableBuffer(object):
+class OverflowableBuffer:
     """
     This buffer implementation has four stages:
     - No data
diff --git a/src/waitress/channel.py b/src/waitress/channel.py
index bc9a2bb..dfb36bb 100644
--- a/src/waitress/channel.py
+++ b/src/waitress/channel.py
@@ -37,7 +37,7 @@ class ClientDisconnected(Exception):
     """ Raised when attempting to write to a closed socket."""
 
 
-class HTTPChannel(wasyncore.dispatcher, object):
+class HTTPChannel(wasyncore.dispatcher):
     """
     Setting self.requests = [somerequest] prevents more requests from being
     received until the out buffers have been flushed.
diff --git a/src/waitress/parser.py b/src/waitress/parser.py
index 765fe59..c2789eb 100644
--- a/src/waitress/parser.py
+++ b/src/waitress/parser.py
@@ -40,7 +40,7 @@ class TransferEncodingNotImplemented(Exception):
     pass
 
 
-class HTTPRequestParser(object):
+class HTTPRequestParser:
     """A structure that collects the HTTP request.
 
     Once the stream is completed, the instance is passed to
diff --git a/src/waitress/receiver.py b/src/waitress/receiver.py
index 5d1568d..8785280 100644
--- a/src/waitress/receiver.py
+++ b/src/waitress/receiver.py
@@ -17,7 +17,7 @@
 from waitress.utilities import BadRequest, find_double_newline
 
 
-class FixedStreamReceiver(object):
+class FixedStreamReceiver:
 
     # See IStreamConsumer
     completed = False
@@ -59,7 +59,7 @@ class FixedStreamReceiver(object):
         return self.buf
 
 
-class ChunkedReceiver(object):
+class ChunkedReceiver:
 
     chunk_remainder = 0
     validate_chunk_end = False
diff --git a/src/waitress/server.py b/src/waitress/server.py
index ae56699..02a6668 100644
--- a/src/waitress/server.py
+++ b/src/waitress/server.py
@@ -137,7 +137,7 @@ def create_server(
 # This class is only ever used if we have multiple listen sockets. It allows
 # the serve() API to call .run() which starts the wasyncore loop, and catches
 # SystemExit/KeyboardInterrupt so that it can atempt to cleanly shut down.
-class MultiSocketServer(object):
+class MultiSocketServer:
     asyncore = wasyncore  # test shim
 
     def __init__(
@@ -172,7 +172,7 @@ class MultiSocketServer(object):
         wasyncore.close_all(self.map)
 
 
-class BaseWSGIServer(wasyncore.dispatcher, object):
+class BaseWSGIServer(wasyncore.dispatcher):
 
     channel_class = HTTPChannel
     next_channel_cleanup = 0
diff --git a/src/waitress/task.py b/src/waitress/task.py
index 6350e34..6ab6bfe 100644
--- a/src/waitress/task.py
+++ b/src/waitress/task.py
@@ -41,7 +41,7 @@ hop_by_hop = frozenset(
 )
 
 
-class ThreadedTaskDispatcher(object):
+class ThreadedTaskDispatcher:
     """A Task Dispatcher that creates a thread for each task.
     """
 
@@ -141,7 +141,7 @@ class ThreadedTaskDispatcher(object):
         return False
 
 
-class Task(object):
+class Task:
     close_on_finish = False
     status = "200 OK"
     wrote_header = False
diff --git a/src/waitress/trigger.py b/src/waitress/trigger.py
index 6a57c12..10ee185 100644
--- a/src/waitress/trigger.py
+++ b/src/waitress/trigger.py
@@ -50,7 +50,7 @@ from . import wasyncore
 # the main thread is trying to remove some]
 
 
-class _triggerbase(object):
+class _triggerbase:
     """OS-independent base class for OS-dependent trigger class."""
 
     kind = None  # subclass must set to "pipe" or "loopback"; used by repr
diff --git a/src/waitress/utilities.py b/src/waitress/utilities.py
index 556bed2..3caaa33 100644
--- a/src/waitress/utilities.py
+++ b/src/waitress/utilities.py
@@ -273,7 +273,7 @@ def cleanup_unix_socket(path):
                 pass
 
 
-class Error(object):
+class Error:
     code = 500
     reason = "Internal Server Error"
 
diff --git a/tests/fixtureapps/filewrapper.py b/tests/fixtureapps/filewrapper.py
index 63df5a6..40b7685 100644
--- a/tests/fixtureapps/filewrapper.py
+++ b/tests/fixtureapps/filewrapper.py
@@ -5,7 +5,7 @@ here = os.path.dirname(os.path.abspath(__file__))
 fn = os.path.join(here, "groundhog1.jpg")
 
 
-class KindaFilelike(object):  # pragma: no cover
+class KindaFilelike:  # pragma: no cover
     def __init__(self, bytes):
         self.bytes = bytes
 
diff --git a/tests/test_buffers.py b/tests/test_buffers.py
index a1330ac..029acfc 100644
--- a/tests/test_buffers.py
+++ b/tests/test_buffers.py
@@ -413,7 +413,7 @@ class TestOverflowableBuffer(unittest.TestCase):
     def test_prune_with_buf(self):
         inst = self._makeOne()
 
-        class Buf(object):
+        class Buf:
             def prune(self):
                 self.pruned = True
 
@@ -477,7 +477,7 @@ class TestOverflowableBuffer(unittest.TestCase):
         self.buffers_to_close.remove(inst)
 
     def test_close_withbuf(self):
-        class Buffer(object):
+        class Buffer:
             def close(self):
                 self.closed = True
 
@@ -489,7 +489,7 @@ class TestOverflowableBuffer(unittest.TestCase):
         self.buffers_to_close.remove(inst)
 
 
-class KindaFilelike(object):
+class KindaFilelike:
     def __init__(self, bytes, close=None, tellresults=None):
         self.bytes = bytes
         self.tellresults = tellresults
@@ -506,7 +506,7 @@ class Filelike(KindaFilelike):
         return v
 
 
-class DummyBuffer(object):
+class DummyBuffer:
     def __init__(self, length=0):
         self.length = length
 
diff --git a/tests/test_channel.py b/tests/test_channel.py
index 14ef5a0..1b119b9 100644
--- a/tests/test_channel.py
+++ b/tests/test_channel.py
@@ -29,13 +29,13 @@ class TestHTTPChannel(unittest.TestCase):
 
         inst, _, map = self._makeOneWithMap()
 
-        class DummyBuffer(object):
+        class DummyBuffer:
             chunks = []
 
             def append(self, data):
                 self.chunks.append(data)
 
-        class DummyData(object):
+        class DummyData:
             def __len__(self):
                 return MAXINT
 
@@ -367,7 +367,7 @@ class TestHTTPChannel(unittest.TestCase):
 
         inst, sock, map = self._makeOneWithMap()
 
-        class DummyHugeOutbuffer(object):
+        class DummyHugeOutbuffer:
             def __init__(self):
                 self.length = MAXINT + 1
 
@@ -705,7 +705,7 @@ class TestHTTPChannel(unittest.TestCase):
         self.assertEqual(inst.requests, [])
 
 
-class DummySock(object):
+class DummySock:
     blocking = False
     closed = False
 
@@ -732,7 +732,7 @@ class DummySock(object):
         return len(data)
 
 
-class DummyLock(object):
+class DummyLock:
     notified = False
 
     def __init__(self, acquirable=True):
@@ -759,7 +759,7 @@ class DummyLock(object):
         pass
 
 
-class DummyBuffer(object):
+class DummyBuffer:
     closed = False
 
     def __init__(self, data, toraise=None):
@@ -783,7 +783,7 @@ class DummyBuffer(object):
         self.closed = True
 
 
-class DummyAdjustments(object):
+class DummyAdjustments:
     outbuf_overflow = 1048576
     outbuf_high_watermark = 1048576
     inbuf_overflow = 512000
@@ -798,7 +798,7 @@ class DummyAdjustments(object):
     max_request_header_size = 10000
 
 
-class DummyServer(object):
+class DummyServer:
     trigger_pulled = False
     adj = DummyAdjustments()
 
@@ -813,7 +813,7 @@ class DummyServer(object):
         self.trigger_pulled = True
 
 
-class DummyParser(object):
+class DummyParser:
     version = 1
     data = None
     completed = True
@@ -831,7 +831,7 @@ class DummyParser(object):
         return len(data)
 
 
-class DummyRequest(object):
+class DummyRequest:
     error = None
     path = "/"
     version = "1.0"
@@ -844,7 +844,7 @@ class DummyRequest(object):
         self.closed = True
 
 
-class DummyLogger(object):
+class DummyLogger:
     def __init__(self):
         self.exceptions = []
         self.infos = []
@@ -857,13 +857,13 @@ class DummyLogger(object):
         self.exceptions.append(msg)
 
 
-class DummyError(object):
+class DummyError:
     code = "431"
     reason = "Bleh"
     body = "My body"
 
 
-class DummyTaskClass(object):
+class DummyTaskClass:
     wrote_header = True
     close_on_finish = False
     serviced = False
diff --git a/tests/test_functional.py b/tests/test_functional.py
index e894497..d8e60a4 100644
--- a/tests/test_functional.py
+++ b/tests/test_functional.py
@@ -61,7 +61,7 @@ class FixtureTcpWSGIServer(server.TcpWSGIServer):
         queue.put((host, port))
 
 
-class SubprocessTests(object):
+class SubprocessTests:
 
     # For nose: all tests may be ran in separate processes.
     _multiprocess_can_split_ = True
@@ -158,7 +158,7 @@ class SleepyThreadTests(TcpTests, unittest.TestCase):
         self.assertEqual(result, b"notsleepy returnedsleepy returned")
 
 
-class EchoTests(object):
+class EchoTests:
     def setUp(self):
         from tests.fixtureapps import echo
 
@@ -480,7 +480,7 @@ class EchoTests(object):
         self.assertEqual(echo.remote_host, "192.168.1.1")
 
 
-class PipeliningTests(object):
+class PipeliningTests:
     def setUp(self):
         from tests.fixtureapps import echo
 
@@ -522,7 +522,7 @@ class PipeliningTests(object):
             self.assertEqual(response_body, expect_body)
 
 
-class ExpectContinueTests(object):
+class ExpectContinueTests:
     def setUp(self):
         from tests.fixtureapps import echo
 
@@ -561,7 +561,7 @@ class ExpectContinueTests(object):
         self.assertEqual(response_body, tobytes(data))
 
 
-class BadContentLengthTests(object):
+class BadContentLengthTests:
     def setUp(self):
         from tests.fixtureapps import badcl
 
@@ -627,7 +627,7 @@ class BadContentLengthTests(object):
         self.assertEqual(int(status), 200)
 
 
-class NoContentLengthTests(object):
+class NoContentLengthTests:
     def setUp(self):
         from tests.fixtureapps import nocl
 
@@ -764,7 +764,7 @@ class NoContentLengthTests(object):
         self.assertRaises(ConnectionClosed, read_http, fp)
 
 
-class WriteCallbackTests(object):
+class WriteCallbackTests:
     def setUp(self):
         from tests.fixtureapps import writecb
 
@@ -865,7 +865,7 @@ class WriteCallbackTests(object):
         self.assertRaises(ConnectionClosed, read_http, fp)
 
 
-class TooLargeTests(object):
+class TooLargeTests:
 
     toobig = 1050
 
@@ -1062,7 +1062,7 @@ class TooLargeTests(object):
         self.assertRaises(ConnectionClosed, read_http, fp)
 
 
-class InternalServerErrorTests(object):
+class InternalServerErrorTests:
     def setUp(self):
         from tests.fixtureapps import error
 
@@ -1214,7 +1214,7 @@ class InternalServerErrorTests(object):
         self.assertRaises(ConnectionClosed, read_http, fp)
 
 
-class FileWrapperTests(object):
+class FileWrapperTests:
     def setUp(self):
         from tests.fixtureapps import filewrapper
 
diff --git a/tests/test_init.py b/tests/test_init.py
index f9b91d7..c824c21 100644
--- a/tests/test_init.py
+++ b/tests/test_init.py
@@ -31,7 +31,7 @@ class Test_serve_paste(unittest.TestCase):
         self.assertEqual(server.ran, True)
 
 
-class DummyServerFactory(object):
+class DummyServerFactory:
     ran = False
 
     def __call__(self, app, **kw):
@@ -44,7 +44,7 @@ class DummyServerFactory(object):
         self.ran = True
 
 
-class DummyAdj(object):
+class DummyAdj:
     verbose = False
 
     def __init__(self, kw):
diff --git a/tests/test_parser.py b/tests/test_parser.py
index 91837c7..ae0b263 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -721,7 +721,7 @@ class TestHTTPRequestParserIntegration(unittest.TestCase):
         self.assertEqual(self.parser.headers, {"CONTENT_LENGTH": "6",})
 
 
-class DummyBodyStream(object):
+class DummyBodyStream:
     def getfile(self):
         return self
 
diff --git a/tests/test_proxy_headers.py b/tests/test_proxy_headers.py
index 15b4a08..1aea477 100644
--- a/tests/test_proxy_headers.py
+++ b/tests/test_proxy_headers.py
@@ -681,7 +681,7 @@ class TestProxyHeadersMiddleware(unittest.TestCase):
         self.assertIn(b'Header "X-Forwarded-Host" malformed', response.body)
 
 
-class DummyLogger(object):
+class DummyLogger:
     def __init__(self):
         self.logged = []
 
@@ -689,14 +689,14 @@ class DummyLogger(object):
         self.logged.append(msg % args)
 
 
-class DummyApp(object):
+class DummyApp:
     def __call__(self, environ, start_response):
         self.environ = environ
         start_response("200 OK", [("Content-Type", "text/plain")])
         yield "hello"
 
 
-class DummyResponse(object):
+class DummyResponse:
     status = None
     headers = None
     body = None
diff --git a/tests/test_receiver.py b/tests/test_receiver.py
index b4910bb..f55aa68 100644
--- a/tests/test_receiver.py
+++ b/tests/test_receiver.py
@@ -226,7 +226,7 @@ class TestChunkedReceiver(unittest.TestCase):
         self.assertEqual(inst.error, None)
 
 
-class DummyBuffer(object):
+class DummyBuffer:
     def __init__(self, data=None):
         if data is None:
             data = []
diff --git a/tests/test_server.py b/tests/test_server.py
index 9134fb8..857ba8f 100644
--- a/tests/test_server.py
+++ b/tests/test_server.py
@@ -263,7 +263,7 @@ class TestWSGIServer(unittest.TestCase):
     def test_maintenance(self):
         inst = self._makeOneWithMap()
 
-        class DummyChannel(object):
+        class DummyChannel:
             requests = []
 
         zombie = DummyChannel()
@@ -479,7 +479,7 @@ class DummySock(socket.socket):
         pass
 
 
-class DummyTaskDispatcher(object):
+class DummyTaskDispatcher:
     def __init__(self):
         self.tasks = []
 
@@ -490,7 +490,7 @@ class DummyTaskDispatcher(object):
         self.was_shutdown = True
 
 
-class DummyTask(object):
+class DummyTask:
     serviced = False
     start_response_called = False
     wrote_header = False
@@ -512,12 +512,12 @@ class DummyAdj:
     channel_timeout = 300
 
 
-class DummyAsyncore(object):
+class DummyAsyncore:
     def loop(self, timeout=30.0, use_poll=False, map=None, count=None):
         raise SystemExit
 
 
-class DummyTrigger(object):
+class DummyTrigger:
     def pull_trigger(self):
         self.pulled = True
 
@@ -525,7 +525,7 @@ class DummyTrigger(object):
         pass
 
 
-class DummyLogger(object):
+class DummyLogger:
     def __init__(self):
         self.logged = []
 
diff --git a/tests/test_task.py b/tests/test_task.py
index 6466823..10b0344 100644
--- a/tests/test_task.py
+++ b/tests/test_task.py
@@ -922,7 +922,7 @@ class TestErrorTask(unittest.TestCase):
         self.assertEqual(lines[8], b"(generated by waitress)")
 
 
-class DummyTask(object):
+class DummyTask:
     serviced = False
     cancelled = False
 
@@ -933,7 +933,7 @@ class DummyTask(object):
         self.cancelled = True
 
 
-class DummyAdj(object):
+class DummyAdj:
     log_socket_errors = True
     ident = "waitress"
     host = "127.0.0.1"
@@ -941,7 +941,7 @@ class DummyAdj(object):
     url_prefix = ""
 
 
-class DummyServer(object):
+class DummyServer:
     server_name = "localhost"
     effective_port = 80
 
@@ -949,7 +949,7 @@ class DummyServer(object):
         self.adj = DummyAdj()
 
 
-class DummyChannel(object):
+class DummyChannel:
     closed_when_done = False
     adj = DummyAdj()
     creation_time = 0
@@ -970,7 +970,7 @@ class DummyChannel(object):
         return len(data)
 
 
-class DummyParser(object):
+class DummyParser:
     version = "1.0"
     command = "GET"
     path = "/"
@@ -990,7 +990,7 @@ def filter_lines(s):
     return list(filter(None, s.split(b"\r\n")))
 
 
-class DummyLogger(object):
+class DummyLogger:
     def __init__(self):
         self.logged = []
 
diff --git a/tests/test_wasyncore.py b/tests/test_wasyncore.py
index 9c23509..d7c8ed3 100644
--- a/tests/test_wasyncore.py
+++ b/tests/test_wasyncore.py
@@ -33,7 +33,7 @@ else:
 TESTFN = "{}_{}_tmp".format(TESTFN, os.getpid())
 
 
-class DummyLogger(object):  # pragma: no cover
+class DummyLogger:  # pragma: no cover
     def __init__(self):
         self.messages = []
 
@@ -41,7 +41,7 @@ class DummyLogger(object):  # pragma: no cover
         self.messages.append((severity, message))
 
 
-class WarningsRecorder(object):  # pragma: no cover
+class WarningsRecorder:  # pragma: no cover
     """Convenience wrapper for the warnings list returned on
        entry to the warnings.catch_warnings() context manager.
     """
@@ -1680,7 +1680,7 @@ class Test_close_all(unittest.TestCase):
         self.assertRaises(RuntimeError, self._callFUT, map)
 
 
-class DummyDispatcher(object):
+class DummyDispatcher:
     read_event_handled = False
     write_event_handled = False
     expt_event_handled = False
@@ -1723,7 +1723,7 @@ class DummyDispatcher(object):
             raise self.exc
 
 
-class DummyTime(object):
+class DummyTime:
     def __init__(self):
         self.sleepvals = []
 
@@ -1731,7 +1731,7 @@ class DummyTime(object):
         self.sleepvals.append(val)
 
 
-class DummySelect(object):
+class DummySelect:
     error = select.error
 
     def __init__(self, exc=None, pollster=None):
@@ -1748,7 +1748,7 @@ class DummySelect(object):
         return self.pollster
 
 
-class DummyPollster(object):
+class DummyPollster:
     def __init__(self, exc=None):
         self.polled = []
         self.exc = exc