瀏覽代碼

Fix 2to3 race which prevents installation on Py3k

setup.py correctly identifies that it needs to run 2to3 but, before it does so,
attempts to import celery.app which results in an AttributeError due to celery's
usage of iteritems().

	Downloading/unpacking Celery
	  Running setup.py egg_info for package Celery
		Traceback (most recent call last):
		  File "<string>", line 14, in <module>
		  File "/Users/jed/[snip]/build/Celery/setup.py", line 16, in <module>
			import celery.app
		  File "celery/__init__.py", line 38, in <module>
			VERSION=VERSION, SERIES=SERIES, VERSION_BANNER=VERSION_BANNER,
		  File "celery/__compat__.py", line 164, in recreate_module
			origins = get_origins(by_module)
		  File "celery/__compat__.py", line 196, in get_origins
			for module, items in defs.iteritems():
		AttributeError: 'dict' object has no attribute 'iteritems'

This is a temporary emergency fix which allows Celery to install successfully on
Pythons where 2to3 is required but better handling of this should be examined.
Jed Smith 12 年之前
父節點
當前提交
de6d870cdc
共有 2 個文件被更改,包括 3 次插入2 次删除
  1. 2 1
      CONTRIBUTORS.txt
  2. 1 1
      setup.py

+ 2 - 1
CONTRIBUTORS.txt

@@ -108,4 +108,5 @@ Loren Abrams, 2012/06/19
 Eran Rundstein, 2012/06/24
 Eran Rundstein, 2012/06/24
 John Watson, 2012/06/27
 John Watson, 2012/06/27
 David Markey, 2012/07/05
 David Markey, 2012/07/05
-Jared Biel, 2012/07/05
+Jared Biel, 2012/07/05
+Jed Smith, 2012/07/08

+ 1 - 1
setup.py

@@ -29,7 +29,7 @@ try:
         print('Upgrade: no old version found.')
         print('Upgrade: no old version found.')
     finally:
     finally:
         sys.path[:] = orig_path
         sys.path[:] = orig_path
-except ImportError:
+except:
     pass
     pass