removes more with_statement imports

celery/app/__init__.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 

celery/app/builtins.py

@@ -8,7 +8,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from collections import deque
 from itertools import starmap

celery/app/task.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery import current_app
 from celery import states

celery/bin/celery.py

@@ -7,7 +7,6 @@ The :program:`celery` umbrella command.
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import anyjson
 import sys

celery/platforms.py

@@ -8,7 +8,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import atexit
 import errno

celery/security/key.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from .utils import crypto, reraise_errors
 

celery/security/serialization.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import base64
 

celery/tests/__init__.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import logging
 import os

celery/tests/app/test_amqp.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from kombu import Exchange, Queue
 from mock import Mock

celery/tests/app/test_app.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 

celery/tests/app/test_beat.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 

celery/tests/app/test_defaults.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import sys
 

celery/tests/app/test_loaders.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 import sys

celery/tests/app/test_log.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import sys
 import logging

celery/tests/app/test_routes.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from functools import wraps
 

celery/tests/backends/test_backends.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import patch
 

celery/tests/backends/test_cassandra.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import socket
 

celery/tests/backends/test_mongodb.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import datetime
 import uuid

celery/tests/backends/test_redis.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from datetime import timedelta
 

celery/tests/bin/test_base.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 

celery/tests/bin/test_camqadm.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import Mock, patch
 

celery/tests/bin/test_celery.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from anyjson import dumps
 from datetime import datetime

celery/tests/bin/test_celeryd.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import logging
 import os

celery/tests/bin/test_celeryd_detach.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import Mock, patch
 

celery/tests/bin/test_celeryd_multi.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import signal

celery/tests/bin/test_celeryev.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from nose import SkipTest
 from mock import patch as mpatch

celery/tests/compat_modules/test_decorators.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery.task import base
 

celery/tests/concurrency/test_eventlet.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 import sys

celery/tests/concurrency/test_gevent.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import os
 import sys

celery/tests/concurrency/test_threads.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import Mock
 

celery/tests/contrib/test_migrate.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from kombu import Connection, Producer, Queue, Exchange
 from kombu.exceptions import StdChannelError

celery/tests/contrib/test_rdb.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import socket

celery/tests/security/test_certificate.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery.exceptions import SecurityError
 from celery.security.certificate import Certificate, CertStore, FSCertStore

celery/tests/security/test_security.py

@@ -13,7 +13,6 @@ Generated with::
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import __builtin__
 

celery/tests/tasks/test_canvas.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import Mock
 

celery/tests/tasks/test_chord.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import patch
 from contextlib import contextmanager

celery/tests/tasks/test_http.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from contextlib import contextmanager
 from functools import wraps

celery/tests/tasks/test_registry.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery.app.registry import TaskRegistry
 from celery.task import Task, PeriodicTask

celery/tests/tasks/test_result.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from pickle import loads, dumps
 from mock import Mock

celery/tests/tasks/test_tasks.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from datetime import datetime, timedelta
 from functools import wraps

celery/tests/utilities/test_imports.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from mock import Mock, patch
 

celery/tests/utilities/test_local.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import sys
 

celery/tests/utilities/test_platforms.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import os

celery/tests/utilities/test_timeutils.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from datetime import datetime, timedelta
 

celery/tests/utils.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 try:
     import unittest

celery/tests/worker/test_autoreload.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import select

celery/tests/worker/test_hub.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery.worker.hub import (
     DummyLock,

celery/tests/worker/test_request.py

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import anyjson
 import os

celery/utils/imports.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import imp as _imp
 import importlib

docs/contributing.rst

@@ -602,7 +602,8 @@ is following the conventions.
 
         from __future__ import absolute_import
 
-    * If the module uses the with statement it must also enable that::
+    * If the module uses the with statement and must be compatible
+      with Python 2.5 (celery is not) then it must also enable that::
 
         from __future__ import with_statement