diff options
-rw-r--r-- | kombu/common.py | 2 | ||||
-rw-r--r-- | kombu/log.py | 2 | ||||
-rw-r--r-- | kombu/pools.py | 1 | ||||
-rw-r--r-- | kombu/tests/test_transport.py | 1 | ||||
-rw-r--r-- | kombu/transport/django/management/commands/clean_kombu_messages.py | 3 | ||||
-rw-r--r-- | kombu/transport/django/managers.py | 2 | ||||
-rw-r--r-- | kombu/utils/debug.py | 2 |
7 files changed, 3 insertions, 10 deletions
diff --git a/kombu/common.py b/kombu/common.py index 7e0b1bea..d431da0c 100644 --- a/kombu/common.py +++ b/kombu/common.py @@ -11,7 +11,6 @@ Common Utilities. from __future__ import absolute_import from __future__ import with_statement -import os import socket import sys @@ -23,7 +22,6 @@ from . import serialization from .entity import Exchange, Queue from .log import Log from .messaging import Consumer -from .pools import producers from .utils import uuid __all__ = ["Broadcast", "entry_to_queue", "maybe_declare", "uuid", diff --git a/kombu/log.py b/kombu/log.py index 916f7141..4c20b711 100644 --- a/kombu/log.py +++ b/kombu/log.py @@ -145,7 +145,7 @@ def setup_logging(loglevel=None, logfile=None): if hasattr(logfile, "write"): handler = logging.StreamHandler(logfile) else: - handler = logging.WatchedFileHandler(logfile) + handler = WatchedFileHandler(logfile) logger.addHandler(handler) logger.setLevel(logging.INFO) return logger diff --git a/kombu/pools.py b/kombu/pools.py index 08a295e3..6061802b 100644 --- a/kombu/pools.py +++ b/kombu/pools.py @@ -39,7 +39,6 @@ class ProducerPool(Resource): def _acquire_connection(self): return self.connections.acquire(block=True) - def create_producer(self): return self.Producer(self._acquire_connection()) diff --git a/kombu/tests/test_transport.py b/kombu/tests/test_transport.py index e80db1f2..b31c3a4c 100644 --- a/kombu/tests/test_transport.py +++ b/kombu/tests/test_transport.py @@ -3,7 +3,6 @@ from __future__ import absolute_import from .. import transport from .utils import unittest -from .utils import mask_modules, module_exists class test_transport(unittest.TestCase): diff --git a/kombu/transport/django/management/commands/clean_kombu_messages.py b/kombu/transport/django/management/commands/clean_kombu_messages.py index 4211c5e9..838ce62c 100644 --- a/kombu/transport/django/management/commands/clean_kombu_messages.py +++ b/kombu/transport/django/management/commands/clean_kombu_messages.py @@ -20,6 +20,3 @@ class Command(BaseCommand): print("Removing %s invisible %s... " % ( count, pluralize("message", count))) Message.objects.cleanup() - - - diff --git a/kombu/transport/django/managers.py b/kombu/transport/django/managers.py index ffb80eff..92a3efc0 100644 --- a/kombu/transport/django/managers.py +++ b/kombu/transport/django/managers.py @@ -4,7 +4,7 @@ from django.db import transaction, connection, models try: from django.db import connections, router except ImportError: # pre-Django 1.2 - connections = router = None + connections = router = None # noqa class QueueManager(models.Manager): diff --git a/kombu/utils/debug.py b/kombu/utils/debug.py index 5c8982ed..6da9c9ba 100644 --- a/kombu/utils/debug.py +++ b/kombu/utils/debug.py @@ -16,7 +16,7 @@ from functools import wraps from ..log import get_logger -__all__ = ["setup_logging", "LogWrapped"] +__all__ = ["setup_logging", "Logwrapped"] def setup_logging(loglevel=logging.DEBUG, loggers=["kombu.connection", |