From f8fac58d7398d1634435580cfb3fcb2752e619e7 Mon Sep 17 00:00:00 2001 From: benoitc Date: Sun, 23 May 2010 00:44:53 +0200 Subject: [PATCH] some fixes discovered with pyflakes --- gunicorn/app/base.py | 5 ++--- gunicorn/app/djangoapp.py | 1 - gunicorn/arbiter.py | 2 -- gunicorn/config.py | 3 +-- gunicorn/management/commands/run_gunicorn.py | 2 -- gunicorn/util.py | 4 ++-- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/gunicorn/app/base.py b/gunicorn/app/base.py index da69f2f7..2f893253 100644 --- a/gunicorn/app/base.py +++ b/gunicorn/app/base.py @@ -4,15 +4,14 @@ # See the NOTICE for more information. import logging -import optparse import os +import sys import traceback -from gunicorn import __version__ from gunicorn import util from gunicorn.arbiter import Arbiter from gunicorn.config import Config -from gunicorn.debug import spew +from gunicorn import debug class Application(object): """\ diff --git a/gunicorn/app/djangoapp.py b/gunicorn/app/djangoapp.py index 3fe64869..494047ec 100644 --- a/gunicorn/app/djangoapp.py +++ b/gunicorn/app/djangoapp.py @@ -9,7 +9,6 @@ import sys from django.core.handlers.wsgi import WSGIHandler from django.core.servers.basehttp import AdminMediaHandler, WSGIServerException -from gunicorn import util from gunicorn.config import Config from gunicorn.app.base import Application diff --git a/gunicorn/arbiter.py b/gunicorn/arbiter.py index 6848248d..f7ce1912 100644 --- a/gunicorn/arbiter.py +++ b/gunicorn/arbiter.py @@ -5,7 +5,6 @@ from __future__ import with_statement -import copy import errno import logging import os @@ -17,7 +16,6 @@ import traceback from gunicorn.pidfile import Pidfile from gunicorn.sock import create_socket -from gunicorn.workers.sync import SyncWorker from gunicorn import util class Arbiter(object): diff --git a/gunicorn/config.py b/gunicorn/config.py index 0bca5979..aa306dc3 100644 --- a/gunicorn/config.py +++ b/gunicorn/config.py @@ -11,7 +11,6 @@ import inspect import optparse import os import pwd -import sys import textwrap import types @@ -90,7 +89,7 @@ class Config(object): group = self.settings['group'].get() if not group: return os.getegid() - elif group.isdigit() or isinstance(user, int): + elif group.isdigit() or isinstance(group, int): return int(group) else: return grp.getgrnam(group).gr_gid diff --git a/gunicorn/management/commands/run_gunicorn.py b/gunicorn/management/commands/run_gunicorn.py index b3a2dac7..ca798cb3 100644 --- a/gunicorn/management/commands/run_gunicorn.py +++ b/gunicorn/management/commands/run_gunicorn.py @@ -5,7 +5,6 @@ from optparse import make_option import sys -import os import django @@ -13,7 +12,6 @@ from django.core.management.base import BaseCommand, CommandError from django.conf import settings from django.utils import translation -from gunicorn.config import Config from gunicorn.app.djangoapp import DjangoApplicationCommand class Command(BaseCommand): diff --git a/gunicorn/util.py b/gunicorn/util.py index 9c3fd94b..bf8faac8 100644 --- a/gunicorn/util.py +++ b/gunicorn/util.py @@ -226,7 +226,7 @@ def daemonize(): else: os._exit(0) - maxfd = util.get_maxfd() + maxfd = get_maxfd() # Iterate through and close all file descriptors. for fd in range(0, maxfd): @@ -235,6 +235,6 @@ def daemonize(): except OSError: # ERROR, fd wasn't open to begin with (ignored) pass - os.open(util.REDIRECT_TO, os.O_RDWR) + os.open(REDIRECT_TO, os.O_RDWR) os.dup2(0, 1) os.dup2(0, 2) \ No newline at end of file