Skip to content

Commit fdb12cc

Browse files
author
Ask Solem
committed
pyflakes
1 parent f0ddafa commit fdb12cc

File tree

13 files changed

+15
-31
lines changed

13 files changed

+15
-31
lines changed

celery/loaders/default.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def read_configuration(self):
6262
DEFAULT_CONFIG_MODULE)
6363
try:
6464
celeryconfig = import_module(configname)
65-
except ImportError, exc:
65+
except ImportError:
6666
warnings.warn("No celeryconfig.py module found! Please make "
6767
"sure it exists and is available to Python.",
6868
NotConfigured)

celery/messaging.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from celery import signals
1515
from celery.utils import gen_unique_id, mitemgetter, noop
1616
from celery.utils.functional import wraps
17-
from celery.loaders import load_settings
1817

1918

2019
MSG_OPTIONS = ("mandatory", "priority", "immediate",

celery/task/builtins.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from datetime import timedelta
22

3-
from celery.backends import default_backend
43
from celery.serialization import pickle
54
from celery.task.base import Task, PeriodicTask
65
from celery.task.sets import TaskSet

celery/task/sets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from celery import conf
66
from celery import registry
77
from celery.datastructures import AttributeDict
8-
from celery.messaging import establish_connection, with_connection
8+
from celery.messaging import with_connection
99
from celery.messaging import TaskPublisher
1010
from celery.result import TaskSetResult
1111
from celery.utils import gen_unique_id

celery/tests/test_backends/test_cache.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
import unittest2 as unittest
44

55
from celery import states
6-
from celery.backends.cache import CacheBackend, get_best_memcache, DummyClient
6+
from celery.backends.cache import CacheBackend, DummyClient
77
from celery.exceptions import ImproperlyConfigured
88
from celery.utils import gen_unique_id
99

10-
from celery.tests.utils import execute_context, mask_modules
10+
from celery.tests.utils import mask_modules
1111

1212

1313
class SomeClass(object):
@@ -92,7 +92,6 @@ def mock_pylibmc(self):
9292
def test_pylibmc(self):
9393
pylibmc = self.mock_pylibmc()
9494
pylibmc.next()
95-
import __builtin__
9695
sys.modules.pop("celery.backends.cache", None)
9796
from celery.backends import cache
9897
self.assertEqual(cache.get_best_memcache().__module__, "pylibmc")

celery/tests/test_backends/test_database.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import sys
2-
import socket
31
import unittest2 as unittest
42

53
from datetime import datetime
@@ -12,8 +10,6 @@
1210
from celery.utils import gen_unique_id
1311
from celery.backends.database import DatabaseBackend
1412

15-
from celery.tests.utils import execute_context, mask_modules
16-
1713

1814
class SomeClass(object):
1915

celery/tests/test_bin/test_celeryd.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
from celery import signals
1212
from celery.bin import celeryd as cd
1313
from celery.exceptions import ImproperlyConfigured
14-
from celery.utils import noop
1514
from celery.utils import patch
1615
from celery.utils.functional import wraps
1716

celery/tests/test_buckets.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from __future__ import generators
22

3-
import os
43
import sys
54
import time
65
import unittest2 as unittest

celery/tests/test_task_http.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
from contextlib import contextmanager
99
except ImportError:
1010
from celery.tests.utils import fallback_contextmanager as contextmanager
11-
try:
12-
from cStringIO import StringIO
13-
except ImportError:
14-
from StringIO import StringIO
11+
from StringIO import StringIO
1512

1613
from anyjson import serialize
1714

celery/tests/test_task_sets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from celery.task import Task
77
from celery.task.sets import subtask, TaskSet
88

9-
from celery.tests.utils import execute_context, with_eager_tasks
9+
from celery.tests.utils import execute_context
1010
from celery.tests.compat import catch_warnings
1111

1212

0 commit comments

Comments
 (0)