Browse Source

Can't have multiple imports from __future__ in Py 2.5.0

Ask Solem 13 years ago
parent
commit
9b21dea245

+ 2 - 1
celery/app/base.py

@@ -8,7 +8,8 @@ Application Base Class.
 :license: BSD, see LICENSE for more details.
 
 """
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
+from __future__ import with_statement
 
 import platform as _platform
 import sys

+ 2 - 1
celery/backends/amqp.py

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

+ 2 - 1
celery/bin/celerybeat.py

@@ -22,7 +22,8 @@
     `ERROR`, `CRITICAL`, or `FATAL`.
 
 """
-from __future__ import with_statement, absolute_import
+from __future__ import with_statement
+from __future__ import absolute_import
 
 from functools import partial
 

+ 2 - 1
celery/bin/celeryd_detach.py

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

+ 2 - 1
celery/bin/celeryev.py

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

+ 2 - 1
celery/events/__init__.py

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

+ 2 - 1
celery/events/state.py

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

+ 2 - 1
celery/result.py

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

+ 2 - 1
celery/task/control.py

@@ -1,4 +1,5 @@
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
+from __future__ import with_statement
 
 from kombu.pidbox import Mailbox
 

+ 2 - 1
celery/task/sets.py

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

+ 2 - 1
celery/tests/test_app/test_app_defaults.py

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

+ 2 - 1
celery/tests/test_backends/test_redis.py

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

+ 2 - 1
celery/utils/__init__.py

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

+ 2 - 1
celery/utils/timer2.py

@@ -1,5 +1,6 @@
 """timer2 - Scheduler for Python functions."""
-from __future__ import absolute_import, with_statement
+from __future__ import absolute_import
+from __future__ import with_statement
 
 import atexit
 import heapq

+ 2 - 1
celery/worker/autoscale.py

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

+ 2 - 1
celery/worker/buckets.py

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

+ 2 - 1
celery/worker/consumer.py

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