Forráskód Böngészése

Tests passing on py33

Ask Solem 11 éve
szülő
commit
345f86a0b0
2 módosított fájl, 2 hozzáadás és 3 törlés
  1. 1 2
      celery/platforms.py
  2. 1 1
      docs/contributing.rst

+ 1 - 2
celery/platforms.py

@@ -18,7 +18,6 @@ import signal as _signal
 import sys
 import sys
 
 
 from collections import namedtuple
 from collections import namedtuple
-from itertools import izip_longest
 
 
 from billiard import current_process
 from billiard import current_process
 # fileno used to be in this module
 # fileno used to be in this module
@@ -28,7 +27,7 @@ from kombu.utils.encoding import safe_str
 from contextlib import contextmanager
 from contextlib import contextmanager
 
 
 from .local import try_import
 from .local import try_import
-from .five import items, range, reraise, string_t
+from .five import items, range, reraise, string_t, zip_longest
 from .utils.functional import uniq
 from .utils.functional import uniq
 
 
 _setproctitle = try_import('setproctitle')
 _setproctitle = try_import('setproctitle')

+ 1 - 1
docs/contributing.rst

@@ -692,8 +692,8 @@ is following the conventions.
         from Queue import Queue, Empty
         from Queue import Queue, Empty
 
 
         from .datastructures import TokenBucket
         from .datastructures import TokenBucket
+        from .five import zip_longest, items, range
         from .utils import timeutils
         from .utils import timeutils
-        from .utils.compat import all, izip_longest, chain_from_iterable
 
 
 * Wildcard imports must not be used (`from xxx import *`).
 * Wildcard imports must not be used (`from xxx import *`).