From 95f6ce56182a1deb3e791a9652f4030c7d71806f Mon Sep 17 00:00:00 2001 From: Benoit Chesneau Date: Tue, 16 Feb 2010 15:43:41 +0100 Subject: [PATCH] remove useless print and revert last commit --- gunicorn/arbiter.py | 3 --- gunicorn/config.py | 2 +- gunicorn/sock.py | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index daa418e6..19a03699 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -77,8 +77,6 @@ class Arbiter(object): self.pidfile = self.opts.get("pidfile") self.log.info("Booted Arbiter: %s" % os.getpid()) self.log.info("Listening on socket: %s" % self.LISTENER) - if 'GUNICORN_FD' in os.environ: - del os.environ['GUNICORN_FD'] def _del_pidfile(self): self._pidfile = None @@ -89,7 +87,6 @@ class Arbiter(object): def _set_pidfile(self, path): if not path: return - pid = self.valid_pidfile(path) if pid: if self.pidfile and path == self.pidfile and pid == os.getpid(): diff --git a/gunicorn/config.py b/gunicorn/config.py index f5978e2a..d4e1fca7 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -99,7 +99,7 @@ class Config(object): @property def address(self): if not self.conf['bind']: - raise RuntimeError("Listener address is not set") + raise RuntimeError("Listener address is not set") return util.parse_address(self.conf['bind']) def _hook(self, hookname, *args): diff --git a/gunicorn/sock.py b/gunicorn/sock.py index 5592b9bf..39aac97a 100644 --- a/gunicorn/sock.py +++ b/gunicorn/sock.py @@ -19,7 +19,6 @@ class BaseSocket(object): if fd is None: sock = socket.socket(self.FAMILY, socket.SOCK_STREAM) else: - print "%r" % fd sock = socket.fromfd(fd, self.FAMILY, socket.SOCK_STREAM) self.sock = self.set_options(sock, bound=(fd is not None))