Drop explicit inheritance from 'object' class

This was necessary in Python 2 to force new-style classes. In Python 3, it's just noise. Substitutions were done automatically with 'sed', except: - twisted/words/xish/xpathparser.g was done by hand and xpathparser.py was re-generated from that - twisted/test/test_plugin.py was done by hand
jamestiotio · Aug 8, 2020 · f6e0c42 · f6e0c42
1 parent 78032af
commit f6e0c42
Show file tree

Hide file tree

Showing 308 changed files with 884 additions and 884 deletions.
diff --git a/src/twisted/_threads/_convenience.py b/src/twisted/_threads/_convenience.py
@@ -10,7 +10,7 @@
 from ._ithreads import AlreadyQuit
 
 
-class Quit(object):
+class Quit:
     """
     A flag representing whether a worker has been quit.
 

diff --git a/src/twisted/_threads/_memory.py b/src/twisted/_threads/_memory.py
@@ -15,7 +15,7 @@
 NoMoreWork = object()
 
 @implementer(IWorker)
-class MemoryWorker(object):
+class MemoryWorker:
     """
     An L{IWorker} that queues work for later performance.
 

diff --git a/src/twisted/_threads/_team.py b/src/twisted/_threads/_team.py
@@ -16,7 +16,7 @@
 
 
 
-class Statistics(object):
+class Statistics:
     """
     Statistics about a L{Team}'s current activity.
 
@@ -41,7 +41,7 @@ def __init__(self, idleWorkerCount, busyWorkerCount,
 
 
 @implementer(IWorker)
-class Team(object):
+class Team:
     """
     A composite L{IWorker} implementation.
 

diff --git a/src/twisted/_threads/_threadworker.py b/src/twisted/_threads/_threadworker.py
@@ -15,7 +15,7 @@
 _stop = object()
 
 @implementer(IExclusiveWorker)
-class ThreadWorker(object):
+class ThreadWorker:
     """
     An L{IExclusiveWorker} implemented based on a single thread and a queue.
 
@@ -68,7 +68,7 @@ def quit(self):
 
 
 @implementer(IExclusiveWorker)
-class LockWorker(object):
+class LockWorker:
     """
     An L{IWorker} implemented based on a mutual-exclusion lock.
     """

diff --git a/src/twisted/_threads/test/test_threadworker.py b/src/twisted/_threads/test/test_threadworker.py
@@ -29,7 +29,7 @@ class WouldDeadlock(Exception):
 
 
 
-class FakeThread(object):
+class FakeThread:
     """
     A fake L{threading.Thread}.
 
@@ -56,7 +56,7 @@ def start(self):
 
 
 
-class FakeQueue(object):
+class FakeQueue:
     """
     A fake L{Queue} implementing C{put} and C{get}.
 
@@ -93,7 +93,7 @@ def get(self):
 
 
 
-class FakeLock(object):
+class FakeLock:
     """
     A stand-in for L{threading.Lock}.
 

diff --git a/src/twisted/application/app.py b/src/twisted/application/app.py
@@ -26,7 +26,7 @@
 from twisted.application.reactors import NoSuchReactor
 
 
-class _BasicProfiler(object):
+class _BasicProfiler:
     """
     @ivar saveStats: if C{True}, save the stats information instead of the
         human readable format
@@ -114,7 +114,7 @@ def run(self, reactor):
 
 
 
-class AppProfiler(object):
+class AppProfiler:
     """
     Class which selects a specific profile runner based on configuration
     options.
@@ -137,7 +137,7 @@ def __init__(self, options):
 
 
 
-class AppLogger(object):
+class AppLogger:
     """
     An L{AppLogger} attaches the configured log observer specified on the
     commandline to a L{ServerOptions} object, a custom L{logger.ILogObserver},
@@ -340,7 +340,7 @@ def getSavePassphrase(needed):
 
 
 
-class ApplicationRunner(object):
+class ApplicationRunner:
     """
     An object which helps running an application based on a config object.
 

diff --git a/src/twisted/application/internet.py b/src/twisted/application/internet.py
@@ -364,7 +364,7 @@ def stopService(self):
 
 
 
-class StreamServerEndpointService(service.Service, object):
+class StreamServerEndpointService(service.Service):
     """
     A L{StreamServerEndpointService} is an L{IService} which runs a server on a
     listening port described by an L{IStreamServerEndpoint
@@ -446,7 +446,7 @@ def stop(passthrough):
 
 
 
-class _ReconnectingProtocolProxy(object):
+class _ReconnectingProtocolProxy:
     """
     A proxy for a Protocol to provide connectionLost notification to a client
     connection service, in support of reconnecting when connections are lost.
@@ -493,7 +493,7 @@ def __repr__(self) -> str:
 
 
 
-class _DisconnectFactory(object):
+class _DisconnectFactory:
     """
     A L{_DisconnectFactory} is a proxy for L{IProtocolFactory} that catches
     C{connectionLost} notifications and relays them.
@@ -590,7 +590,7 @@ def _firstResult(gen):
 
 
 
-class _ClientMachine(object):
+class _ClientMachine:
     """
     State machine for maintaining a single outgoing connection to an endpoint.
 
@@ -1077,7 +1077,7 @@ def _deliverConnectionFailure(self, f):
 
 
 
-class ClientService(service.Service, object):
+class ClientService(service.Service):
     """
     A L{ClientService} maintains a single outgoing connection to a client
     endpoint, reconnecting after a configurable timeout when a connection

diff --git a/src/twisted/application/reactors.py b/src/twisted/application/reactors.py
@@ -44,7 +44,7 @@ class NoSuchReactor(KeyError):
 
 
 @implementer(IPlugin, IReactorInstaller)
-class Reactor(object):
+class Reactor:
     """
     @ivar moduleName: The fully-qualified Python name of the module of which
     the install callable is an attribute.

diff --git a/src/twisted/application/runner/_exit.py b/src/twisted/application/runner/_exit.py
@@ -42,7 +42,7 @@ def exit(status, message=None):
 try:
     import posix as Status
 except ImportError:
-    class Status(object):  # type: ignore[no-redef]
+    class Status:  # type: ignore[no-redef]
         """
         Object to hang C{EX_*} values off of as a substitute for L{posix}.
         """

diff --git a/src/twisted/application/runner/_pidfile.py b/src/twisted/application/runner/_pidfile.py
@@ -86,7 +86,7 @@ def __exit__(excType, excValue, traceback):
 
 
 @implementer(IPIDFile)
-class PIDFile(object):
+class PIDFile:
     """
     Concrete implementation of L{IPIDFile} based on C{IFilePath}.
 
@@ -220,7 +220,7 @@ def __exit__(self, excType, excValue, traceback):
 
 
 @implementer(IPIDFile)
-class NonePIDFile(object):
+class NonePIDFile:
     """
     PID file implementation that does nothing.
 

diff --git a/src/twisted/application/runner/_runner.py b/src/twisted/application/runner/_runner.py
@@ -24,7 +24,7 @@
 
 
 @attrs(frozen=True)
-class Runner(object):
+class Runner:
     """
     Twisted application runner.
 

diff --git a/src/twisted/application/runner/test/test_exit.py b/src/twisted/application/runner/test/test_exit.py
@@ -88,7 +88,7 @@ def test_exitMessageNonZero(self):
 
 
 
-class DummyExit(object):
+class DummyExit:
     """
     Stub for L{sys.exit} that remembers whether it's been called and, if it
     has, what argument it was given.

diff --git a/src/twisted/application/runner/test/test_pidfile.py b/src/twisted/application/runner/test/test_pidfile.py
@@ -444,7 +444,7 @@ def test_contextManager(self):
 
 
 @implementer(IFilePath)
-class DummyFilePath(object):
+class DummyFilePath:
     """
     In-memory L{IFilePath}.
     """

diff --git a/src/twisted/application/runner/test/test_runner.py b/src/twisted/application/runner/test/test_runner.py
@@ -213,7 +213,7 @@ def test_startLogging(self):
         # Patch the log beginner so that we don't try to start the already
         # running (started by trial) logging system.
 
-        class LogBeginner(object):
+        class LogBeginner:
             def beginLoggingTo(self, observers):
                 LogBeginner.observers = observers
 
@@ -401,7 +401,7 @@ def __exit__(self, excType, excValue, traceback):
 
 
 
-class DummyExit(object):
+class DummyExit:
     """
     Stub for L{exit} that remembers whether it's been called and, if it has,
     what arguments it was given.
@@ -420,7 +420,7 @@ def __call__(self, status, message=None):
 
 
 
-class DummyKill(object):
+class DummyKill:
     """
     Stub for L{os.kill} that remembers whether it's been called and, if it has,
     what arguments it was given.
@@ -435,7 +435,7 @@ def __call__(self, pid, sig):
 
 
 
-class DummyStandardIO(object):
+class DummyStandardIO:
     """
     Stub for L{sys} which provides L{BytesIO} streams as stdout and stderr.
     """
@@ -446,7 +446,7 @@ def __init__(self, stdout, stderr):
 
 
 
-class DummyWarningsModule(object):
+class DummyWarningsModule:
     """
     Stub for L{warnings} which provides a C{showwarning} method that is a no-op.
     """

diff --git a/src/twisted/application/service.py b/src/twisted/application/service.py
@@ -59,7 +59,7 @@ def makeService(options):
 
 
 @implementer(IPlugin, IServiceMaker)
-class ServiceMaker(object):
+class ServiceMaker:
     """
     Utility class to simplify the definition of L{IServiceMaker} plugins.
     """
@@ -154,7 +154,7 @@ def privilegedStartService():
 
 
 @implementer(IService)
-class Service(object):
+class Service:
     """
     Base class for services.
 

diff --git a/src/twisted/application/test/test_internet.py b/src/twisted/application/test/test_internet.py
@@ -41,7 +41,7 @@ def fakeTargetFunction():
 
 
 @implementer(IStreamServerEndpoint)
-class FakeServer(object):
+class FakeServer:
     """
     In-memory implementation of L{IStreamServerEndpoint}.
 
@@ -112,7 +112,7 @@ def stoppedListening(self):
 
 
 @implementer(IListeningPort)
-class FakePort(object):
+class FakePort:
     """
     Fake L{IListeningPort} implementation.
 
@@ -453,7 +453,7 @@ def test_pickleTimerServiceNotPickleLoopFinished(self):
 
 
 
-class ConnectInformation(object):
+class ConnectInformation:
     """
     Information about C{endpointForTesting}
 
@@ -485,7 +485,7 @@ def endpointForTesting(fireImmediately=False):
         C{endpoint}.
     """
     @implementer(IStreamClientEndpoint)
-    class ClientTestEndpoint(object):
+    class ClientTestEndpoint:
         def connect(self, factory):
             result = Deferred()
             info.passedFactories.append(factory)
@@ -572,7 +572,7 @@ def makeReconnector(self, fireImmediately=True, startService=True,
 
         applicationProtocols = cq.applicationProtocols = []
 
-        class RememberingFactory(Factory, object):
+        class RememberingFactory(Factory):
             protocol = protocolType
             def buildProtocol(self, addr):
                 result = super(RememberingFactory, self).buildProtocol(addr)
@@ -704,7 +704,7 @@ def test_interfacesForTransport(self):
         the reactor.
         """
         @implementer(IHalfCloseableProtocol, IFileDescriptorReceiver)
-        class FancyProtocol(Protocol, object):
+        class FancyProtocol(Protocol):
             """
             Provider of various interfaces.
             """

diff --git a/src/twisted/application/test/test_service.py b/src/twisted/application/test/test_service.py
@@ -18,7 +18,7 @@
 
 
 @implementer(IService)
-class AlmostService(object):
+class AlmostService:
     """
     Implement IService in a way that can fail.
 

diff --git a/src/twisted/application/twist/_twist.py b/src/twisted/application/twist/_twist.py
@@ -18,7 +18,7 @@
 
 
 
-class Twist(object):
+class Twist:
     """
     Run a Twisted application.
     """

diff --git a/src/twisted/application/twist/test/test_options.py b/src/twisted/application/twist/test/test_options.py
@@ -288,7 +288,7 @@ def test_selectDefaultLogObserverDefaultWithTTY(self):
         L{TwistOptions.selectDefaultLogObserver} will not override an already
         selected observer.
         """
-        class TTYFile(object):
+        class TTYFile:
             def isatty(self):
                 return True
 

diff --git a/src/twisted/application/twist/test/test_twist.py b/src/twisted/application/twist/test/test_twist.py
@@ -165,7 +165,7 @@ def test_main(self):
 
         runners = []
 
-        class Runner(object):
+        class Runner:
             def __init__(self, **kwargs):
                 self.args = kwargs
                 self.runs = 0
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ @@
-    class Twist(object):
+    class Twist:
         """
         Run a Twisted application.
         """
@@ Expand Down @@