Merge branch '3.0'

Conflicts:
	celery/utils/timer2.py
	setup.py

CONTRIBUTORS.txt

@@ -120,3 +120,4 @@ Adam DePue, 2012/08/22
 Thomas Meson, 2012/08/28
 Daniel Lundin, 2012/08/30
 Alexey Zatelepin, 2012/09/18
+Sundar Raman, 2012/09/24

celery/utils/__init__.py

@@ -19,7 +19,7 @@ from functools import partial, wraps
 from inspect import getargspec
 from pprint import pprint
 
-from kombu import Exchange, Queue
+from kombu.entity import Exchange, Queue
 
 from celery.exceptions import CPendingDeprecationWarning, CDeprecationWarning
 from .compat import StringIO

celery/utils/timer2.py

@@ -118,7 +118,7 @@ class Schedule(object):
         if isinstance(eta, datetime):
             try:
                 eta = to_timestamp(eta)
-            except Exception as exc:
+            except Exception, exc:
                 if not self.handle_error(exc):
                     raise
                 return

requirements/README.rst

@@ -10,10 +10,6 @@ Index
 
     Default requirements for Python 2.7+.
 
-* :file:`requirements/extra-py3k.txt`
-
-    Extra requirements for Python 3.2+.
-
 * :file:`requirements/jython.txt`
 
     Extra requirements needed to run on Jython 2.5
@@ -46,13 +42,12 @@ Index
 Examples
 ========
 
-Installing requirements for running Python 3
---------------------------------------------
+Installing requirements
+-----------------------
 
 ::
 
     $ pip install -U -r requirements/default.txt
-    $ pip install -U -r requirements/extra-py3k.txt
 
 
 Running the tests

requirements/extra-py3k.txt

@@ -1 +0,0 @@
-pytz

setup.py

@@ -152,8 +152,6 @@ def reqs(f):
         os.path.join(os.getcwd(), 'requirements', f)).readlines()]))
 
 install_requires = reqs('default.txt')
-if is_py3k:
-    install_requires.extend(reqs('extra-py3k.txt'))
 if is_jython:
     install_requires.extend(reqs('jython.txt'))
 

tox.ini

@@ -11,7 +11,6 @@ recreate = True
 basepython = python3.2
 changedir = .tox
 deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/extra-py3k.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \
@@ -26,7 +25,6 @@ recreate = True
 basepython = python3.3
 changedir = .tox
 deps = -r{toxinidir}/requirements/default.txt
-       -r{toxinidir}/requirements/extra-py3k.txt
 commands = {toxinidir}/extra/release/removepyc.sh {toxinidir}
            {envbindir}/easy_install -U distribute
            {envbindir}/pip install                              \