From 5b89fe1beb3d6e287fbe56a0f0a2d302cbaddb7e Mon Sep 17 00:00:00 2001 From: Benno Rice Date: Wed, 24 May 2017 21:07:30 -0700 Subject: [PATCH] Don't use a list comprehension as shorthand for a for loop. --- gunicorn/arbiter.py | 10 ++++++---- gunicorn/workers/base.py | 6 ++++-- gunicorn/workers/geventlet.py | 9 ++++++--- gunicorn/workers/ggevent.py | 3 ++- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index 80989ebe..a2fe4bd1 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -173,8 +173,8 @@ class Arbiter(object): are queued. Child signals only wake up the master. """ # close old PIPE - if self.PIPE: - [os.close(p) for p in self.PIPE] + for p in self.PIPE: + os.close(p) # initialize the pipe self.PIPE = pair = os.pipe() @@ -185,7 +185,8 @@ class Arbiter(object): self.log.close_on_exec() # initialize all signals - [signal.signal(s, self.signal) for s in self.SIGNALS] + for s in self.SIGNALS: + signal.signal(s, self.signal) signal.signal(signal.SIGCHLD, self.handle_chld) def signal(self, sig, frame): @@ -454,7 +455,8 @@ class Arbiter(object): # do we need to change listener ? if old_address != self.cfg.address: # close all listeners - [l.close() for l in self.LISTENERS] + for l in self.LISTENERS: + l.close() # init new listeners self.LISTENERS = sock.create_sockets(self.cfg, self.log) listeners_str = ",".join([str(l) for l in self.LISTENERS]) diff --git a/gunicorn/workers/base.py b/gunicorn/workers/base.py index 5781916a..6e2ad45c 100644 --- a/gunicorn/workers/base.py +++ b/gunicorn/workers/base.py @@ -101,7 +101,8 @@ class Worker(object): util.close_on_exec(p) # Prevent fd inheritance - [util.close_on_exec(s) for s in self.sockets] + for s in self.sockets: + util.close_on_exec(s) util.close_on_exec(self.tmp.fileno()) self.wait_fds = self.sockets + [self.PIPE[0]] @@ -156,7 +157,8 @@ class Worker(object): def init_signals(self): # reset signaling - [signal.signal(s, signal.SIG_DFL) for s in self.SIGNALS] + for s in self.SIGNALS: + signal.signal(s, signal.SIG_DFL) # init new signaling signal.signal(signal.SIGQUIT, self.handle_quit) signal.signal(signal.SIGTERM, self.handle_exit) diff --git a/gunicorn/workers/geventlet.py b/gunicorn/workers/geventlet.py index ec1bf135..6c15bd6d 100644 --- a/gunicorn/workers/geventlet.py +++ b/gunicorn/workers/geventlet.py @@ -134,9 +134,12 @@ class EventletWorker(AsyncWorker): self.notify() try: with eventlet.Timeout(self.cfg.graceful_timeout) as t: - [a.kill(eventlet.StopServe()) for a in acceptors] - [a.wait() for a in acceptors] + for a in acceptors: + a.kill(eventlet.StopServe()) + for a in acceptors: + a.wait() except eventlet.Timeout as te: if te != t: raise - [a.kill() for a in acceptors] + for a in acceptors: + a.kill() diff --git a/gunicorn/workers/ggevent.py b/gunicorn/workers/ggevent.py index 9e51944f..7eed0f1e 100644 --- a/gunicorn/workers/ggevent.py +++ b/gunicorn/workers/ggevent.py @@ -143,7 +143,8 @@ class GeventWorker(AsyncWorker): # Force kill all active the handlers self.log.warning("Worker graceful timeout (pid:%s)" % self.pid) - [server.stop(timeout=1) for server in servers] + for server in servers: + server.stop(timeout=1) except: pass