From a8963ef1a5a76f3df75ce477b55fe0297e3b617d Mon Sep 17 00:00:00 2001 From: Marat Date: Sat, 23 Feb 2019 23:28:56 +0300 Subject: [PATCH] Remove redundant super() arguments --- .../testing/testing/apps/someapp/middleware.py | 2 +- examples/standalone_app.py | 2 +- examples/when_ready.conf.py | 2 +- gunicorn/app/base.py | 2 +- gunicorn/config.py | 4 ++-- gunicorn/glogging.py | 4 ++-- gunicorn/http/message.py | 4 ++-- gunicorn/http/unreader.py | 4 ++-- gunicorn/reloader.py | 4 ++-- gunicorn/sock.py | 4 ++-- gunicorn/workers/base.py | 3 +-- gunicorn/workers/base_async.py | 2 +- gunicorn/workers/geventlet.py | 10 +++++----- gunicorn/workers/ggevent.py | 15 +++++++-------- gunicorn/workers/gthread.py | 4 ++-- gunicorn/workers/gtornado.py | 4 ++-- tests/test_arbiter.py | 2 +- tests/test_config.py | 2 +- 18 files changed, 36 insertions(+), 38 deletions(-) diff --git a/examples/frameworks/django/testing/testing/apps/someapp/middleware.py b/examples/frameworks/django/testing/testing/apps/someapp/middleware.py index 39a4e234..ddc667a9 100644 --- a/examples/frameworks/django/testing/testing/apps/someapp/middleware.py +++ b/examples/frameworks/django/testing/testing/apps/someapp/middleware.py @@ -10,7 +10,7 @@ def child_process(queue): class GunicornSubProcessTestMiddleware(object): def __init__(self): - super(GunicornSubProcessTestMiddleware, self).__init__() + super().__init__() self.queue = Queue() self.process = Process(target=child_process, args=(self.queue,)) self.process.start() diff --git a/examples/standalone_app.py b/examples/standalone_app.py index 9abda283..7731aaf5 100644 --- a/examples/standalone_app.py +++ b/examples/standalone_app.py @@ -35,7 +35,7 @@ class StandaloneApplication(gunicorn.app.base.BaseApplication): def __init__(self, app, options=None): self.options = options or {} self.application = app - super(StandaloneApplication, self).__init__() + super().__init__() def load_config(self): config = {key: value for key, value in self.options.items() diff --git a/examples/when_ready.conf.py b/examples/when_ready.conf.py index 195284b3..1531ec14 100644 --- a/examples/when_ready.conf.py +++ b/examples/when_ready.conf.py @@ -8,7 +8,7 @@ max_mem = 100000 class MemoryWatch(threading.Thread): def __init__(self, server, max_mem): - super(MemoryWatch, self).__init__() + super().__init__() self.daemon = True self.server = server self.max_mem = max_mem diff --git a/gunicorn/app/base.py b/gunicorn/app/base.py index 1d6b3897..0276b009 100644 --- a/gunicorn/app/base.py +++ b/gunicorn/app/base.py @@ -218,4 +218,4 @@ class Application(BaseApplication): if pythonpath not in sys.path: sys.path.insert(0, pythonpath) - super(Application, self).run() + super().run() diff --git a/gunicorn/config.py b/gunicorn/config.py index 03fa887b..8dda626e 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -59,7 +59,7 @@ class Config(object): def __setattr__(self, name, value): if name != "settings" and name in self.settings: raise AttributeError("Invalid access!") - super(Config, self).__setattr__(name, value) + super().__setattr__(name, value) def set(self, name, value): if name not in self.settings: @@ -224,7 +224,7 @@ class Config(object): class SettingMeta(type): def __new__(cls, name, bases, attrs): - super_new = super(SettingMeta, cls).__new__ + super_new = super().__new__ parents = [b for b in bases if isinstance(b, SettingMeta)] if not parents: return super_new(cls, name, bases, attrs) diff --git a/gunicorn/glogging.py b/gunicorn/glogging.py index 56cc5bd0..3f7b4ac7 100644 --- a/gunicorn/glogging.py +++ b/gunicorn/glogging.py @@ -108,11 +108,11 @@ class SafeAtoms(dict): if k.startswith("{"): kl = k.lower() if kl in self: - return super(SafeAtoms, self).__getitem__(kl) + return super().__getitem__(kl) else: return "-" if k in self: - return super(SafeAtoms, self).__getitem__(k) + return super().__getitem__(k) else: return '-' diff --git a/gunicorn/http/message.py b/gunicorn/http/message.py index 0dda58db..3c080207 100644 --- a/gunicorn/http/message.py +++ b/gunicorn/http/message.py @@ -177,7 +177,7 @@ class Request(Message): self.req_number = req_number self.proxy_protocol_info = None - super(Request, self).__init__(cfg, unreader) + super().__init__(cfg, unreader) def get_data(self, unreader, buf, stop=False): data = unreader.read() @@ -357,6 +357,6 @@ class Request(Message): self.version = (int(match.group(1)), int(match.group(2))) def set_body_reader(self): - super(Request, self).set_body_reader() + super().set_body_reader() if isinstance(self.body.reader, EOFReader): self.body = Body(LengthReader(self.unreader, 0)) diff --git a/gunicorn/http/unreader.py b/gunicorn/http/unreader.py index be07e7ac..273bfc31 100644 --- a/gunicorn/http/unreader.py +++ b/gunicorn/http/unreader.py @@ -56,7 +56,7 @@ class Unreader(object): class SocketUnreader(Unreader): def __init__(self, sock, max_chunk=8192): - super(SocketUnreader, self).__init__() + super().__init__() self.sock = sock self.mxchunk = max_chunk @@ -66,7 +66,7 @@ class SocketUnreader(Unreader): class IterUnreader(Unreader): def __init__(self, iterable): - super(IterUnreader, self).__init__() + super().__init__() self.iter = iter(iterable) def chunk(self): diff --git a/gunicorn/reloader.py b/gunicorn/reloader.py index 96b7d288..500b22ed 100644 --- a/gunicorn/reloader.py +++ b/gunicorn/reloader.py @@ -15,7 +15,7 @@ COMPILED_EXT_RE = re.compile(r'py[co]$') class Reloader(threading.Thread): def __init__(self, extra_files=None, interval=1, callback=None): - super(Reloader, self).__init__() + super().__init__() self.setDaemon(True) self._extra_files = set(extra_files or ()) self._extra_files_lock = threading.RLock() @@ -74,7 +74,7 @@ if has_inotify: | inotify.constants.IN_MOVED_TO) def __init__(self, extra_files=None, callback=None): - super(InotifyReloader, self).__init__() + super().__init__() self.setDaemon(True) self._callback = callback self._dirs = set() diff --git a/gunicorn/sock.py b/gunicorn/sock.py index 8d35c4d4..e53e578e 100644 --- a/gunicorn/sock.py +++ b/gunicorn/sock.py @@ -87,7 +87,7 @@ class TCPSocket(BaseSocket): def set_options(self, sock, bound=False): sock.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) - return super(TCPSocket, self).set_options(sock, bound=bound) + return super().set_options(sock, bound=bound) class TCP6Socket(TCPSocket): @@ -115,7 +115,7 @@ class UnixSocket(BaseSocket): os.remove(addr) else: raise ValueError("%r is not a socket" % addr) - super(UnixSocket, self).__init__(addr, conf, log, fd=fd) + super().__init__(addr, conf, log, fd=fd) def __str__(self): return "unix:%s" % self.cfg_addr diff --git a/gunicorn/workers/base.py b/gunicorn/workers/base.py index 3e9fb1e9..f95994bc 100644 --- a/gunicorn/workers/base.py +++ b/gunicorn/workers/base.py @@ -85,8 +85,7 @@ class Worker(object): """\ If you override this method in a subclass, the last statement in the function should be to call this method with - super(MyWorkerClass, self).init_process() so that the ``run()`` - loop is initiated. + super().init_process() so that the ``run()`` loop is initiated. """ # set environment' variables diff --git a/gunicorn/workers/base_async.py b/gunicorn/workers/base_async.py index 05f4799a..ebd0fc10 100644 --- a/gunicorn/workers/base_async.py +++ b/gunicorn/workers/base_async.py @@ -20,7 +20,7 @@ ALREADY_HANDLED = object() class AsyncWorker(base.Worker): def __init__(self, *args, **kwargs): - super(AsyncWorker, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.worker_connections = self.cfg.worker_connections def timeout_ctx(self): diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py index eda95992..91d2f333 100644 --- a/gunicorn/workers/geventlet.py +++ b/gunicorn/workers/geventlet.py @@ -93,17 +93,17 @@ class EventletWorker(AsyncWorker): if respiter == EVENTLET_ALREADY_HANDLED: raise StopIteration() else: - return super(EventletWorker, self).is_already_handled(respiter) + return super().is_already_handled(respiter) def init_process(self): - super(EventletWorker, self).init_process() + super().init_process() self.patch() def handle_quit(self, sig, frame): - eventlet.spawn(super(EventletWorker, self).handle_quit, sig, frame) + eventlet.spawn(super().handle_quit, sig, frame) def handle_usr1(self, sig, frame): - eventlet.spawn(super(EventletWorker, self).handle_usr1, sig, frame) + eventlet.spawn(super().handle_usr1, sig, frame) def timeout_ctx(self): return eventlet.Timeout(self.cfg.keepalive or None, False) @@ -113,7 +113,7 @@ class EventletWorker(AsyncWorker): client = eventlet.wrap_ssl(client, server_side=True, **self.cfg.ssl_options) - super(EventletWorker, self).handle(listener, client, addr) + super().handle(listener, client, addr) def run(self): acceptors = [] diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py index 6c614fe2..5dfec5e1 100644 --- a/gunicorn/workers/ggevent.py +++ b/gunicorn/workers/ggevent.py @@ -63,7 +63,7 @@ class GeventWorker(AsyncWorker): self.sockets = sockets def notify(self): - super(GeventWorker, self).notify() + super().notify() if self.ppid != os.getppid(): self.log.info("Parent changed, shutting down: %s", self) sys.exit(0) @@ -136,12 +136,11 @@ class GeventWorker(AsyncWorker): # Connected socket timeout defaults to socket.getdefaulttimeout(). # This forces to blocking mode. client.setblocking(1) - super(GeventWorker, self).handle(listener, client, addr) + super().handle(listener, client, addr) def handle_request(self, listener_name, req, sock, addr): try: - super(GeventWorker, self).handle_request(listener_name, req, sock, - addr) + super().handle_request(listener_name, req, sock, addr) except gevent.GreenletExit: pass except SystemExit: @@ -150,17 +149,17 @@ class GeventWorker(AsyncWorker): def handle_quit(self, sig, frame): # Move this out of the signal handler so we can use # blocking calls. See #1126 - gevent.spawn(super(GeventWorker, self).handle_quit, sig, frame) + gevent.spawn(super().handle_quit, sig, frame) def handle_usr1(self, sig, frame): # Make the gevent workers handle the usr1 signal # by deferring to a new greenlet. See #1645 - gevent.spawn(super(GeventWorker, self).handle_usr1, sig, frame) + gevent.spawn(super().handle_usr1, sig, frame) def init_process(self): self.patch() hub.reinit() - super(GeventWorker, self).init_process() + super().init_process() class GeventResponse(object): @@ -190,7 +189,7 @@ class PyWSGIHandler(pywsgi.WSGIHandler): self.server.log.access(resp, req_headers, self.environ, response_time) def get_environ(self): - env = super(PyWSGIHandler, self).get_environ() + env = super().get_environ() env['gunicorn.sock'] = self.socket env['RAW_URI'] = self.path return env diff --git a/gunicorn/workers/gthread.py b/gunicorn/workers/gthread.py index a4c4c771..30d2745e 100644 --- a/gunicorn/workers/gthread.py +++ b/gunicorn/workers/gthread.py @@ -65,7 +65,7 @@ class TConn(object): class ThreadWorker(base.Worker): def __init__(self, *args, **kwargs): - super(ThreadWorker, self).__init__(*args, **kwargs) + super().__init__(*args, **kwargs) self.worker_connections = self.cfg.worker_connections self.max_keepalived = self.cfg.worker_connections - self.cfg.threads # initialise the pool @@ -88,7 +88,7 @@ class ThreadWorker(base.Worker): self.tpool = self.get_thread_pool() self.poller = selectors.DefaultSelector() self._lock = RLock() - super(ThreadWorker, self).init_process() + super().init_process() def get_thread_pool(self): """Override this method to customize how the thread pool is created""" diff --git a/gunicorn/workers/gtornado.py b/gunicorn/workers/gtornado.py index 9c8379c2..40e5572a 100644 --- a/gunicorn/workers/gtornado.py +++ b/gunicorn/workers/gtornado.py @@ -44,7 +44,7 @@ class TornadoWorker(Worker): def handle_exit(self, sig, frame): if self.alive: - super(TornadoWorker, self).handle_exit(sig, frame) + super().handle_exit(sig, frame) def handle_request(self): self.nr += 1 @@ -84,7 +84,7 @@ class TornadoWorker(Worker): # should create its own IOLoop. We should clear current IOLoop # if exists before os.fork. IOLoop.clear_current() - super(TornadoWorker, self).init_process() + super().init_process() def run(self): self.ioloop = IOLoop.instance() diff --git a/tests/test_arbiter.py b/tests/test_arbiter.py index fa376ce7..bfd9fe65 100644 --- a/tests/test_arbiter.py +++ b/tests/test_arbiter.py @@ -173,7 +173,7 @@ class PreloadedAppWithEnvSettings(DummyApplication): 'preloaded' application. """ verify_env_vars() - return super(PreloadedAppWithEnvSettings, self).wsgi() + return super().wsgi() def verify_env_vars(): diff --git a/tests/test_config.py b/tests/test_config.py index 98420bd0..0587c63c 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -42,7 +42,7 @@ class AltArgs(object): class NoConfigApp(Application): def __init__(self): - super(NoConfigApp, self).__init__("no_usage", prog="gunicorn_test") + super().__init__("no_usage", prog="gunicorn_test") def init(self, parser, opts, args): pass