On 2.6 we don't have to import with statement from __future__

Conflicts:

	celery/bin/celeryctl.py
	celery/tests/test_app/__init__.py
	celery/tests/test_app/test_app_amqp.py
	celery/tests/test_app/test_app_defaults.py
	celery/tests/test_app/test_loaders.py
	celery/tests/test_app/test_log.py
	celery/tests/test_app/test_routes.py
	celery/tests/test_backends/__init__.py
	celery/tests/test_backends/test_redis.py
	celery/tests/test_bin/__init__.py
	celery/tests/test_bin/test_celeryd.py
	celery/tests/test_task/__init__.py
	celery/tests/test_task/test_chord.py
	celery/tests/test_task/test_registry.py
	celery/tests/test_task/test_result.py
	celery/tests/test_task/test_task_http.py
	celery/tests/test_worker/test_worker_job.py
	contrib/release/flakeplus.py

celery/app/base.py

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

celery/app/control.py

@@ -8,7 +8,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from kombu.pidbox import Mailbox
 from kombu.utils import cached_property

celery/backends/amqp.py

@@ -9,7 +9,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import socket
 import threading

celery/bin/celerybeat.py

@@ -38,7 +38,6 @@
     `ERROR`, `CRITICAL`, or `FATAL`.
 
 """
-from __future__ import with_statement
 from __future__ import absolute_import
 
 import os

celery/bin/celeryd_detach.py

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

celery/bin/celeryev.py

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

celery/contrib/migrate.py

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

celery/datastructures.py

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

celery/events/__init__.py

@@ -9,7 +9,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import time
 import socket

celery/events/cursesmon.py

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

celery/events/state.py

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

celery/result.py

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

celery/security/__init__.py

@@ -7,7 +7,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from kombu.serialization import registry
 

celery/security/certificate.py

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

celery/task/sets.py

@@ -8,7 +8,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery._state import get_current_worker_task
 from celery.app import app_or_default

celery/tests/app/test_control.py

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

celery/tests/backends/test_amqp.py

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

celery/tests/backends/test_base.py

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

celery/tests/backends/test_cache.py

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

celery/tests/backends/test_database.py

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

celery/tests/bin/test_celerybeat.py

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

celery/tests/concurrency/test_concurrency.py

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

celery/tests/concurrency/test_processes.py

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

celery/tests/events/test_events.py

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

celery/tests/events/test_snapshot.py

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

celery/tests/slow/test_buckets.py

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

celery/tests/tasks/test_sets.py

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

celery/tests/tasks/test_trace.py

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

celery/tests/utilities/test_datastructures.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from celery.datastructures import (
     ExceptionInfo,

celery/tests/utilities/test_serialization.py

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

celery/tests/utilities/test_timer2.py

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

celery/tests/utilities/test_utils.py

@@ -1,5 +1,4 @@
 from __future__ import absolute_import
-from __future__ import with_statement
 
 from kombu.utils.functional import promise
 

celery/tests/worker/test_bootsteps.py

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

celery/tests/worker/test_control.py

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

celery/tests/worker/test_worker.py

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

celery/utils/__init__.py

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

celery/utils/functional.py

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

celery/utils/timer2.py

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

celery/worker/autoreload.py

@@ -6,7 +6,6 @@
     This module implements automatic module reloading
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import hashlib

celery/worker/autoscale.py

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

celery/worker/buckets.py

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

celery/worker/consumer.py

@@ -71,7 +71,6 @@
 
 """
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import logging
 import socket

examples/eventlet/bulk_task_producer.py

@@ -1,4 +1,3 @@
-from __future__ import with_statement
 
 from eventlet import spawn_n, monkey_patch, Timeout
 from eventlet.queue import LightQueue

examples/eventlet/webcrawler.py

@@ -21,7 +21,6 @@
 
 """
 
-from __future__ import with_statement
 
 import re
 import time

extra/release/attribution.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import fileinput
 

extra/release/bump_version.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 from __future__ import absolute_import
-from __future__ import with_statement
 
 import errno
 import os