prompt: We are currently solving the following issue within our repository. Here is the issue text:
  --- BEGIN ISSUE ---
  celery 3.0 causes import error (cannot import abbrtools from celery.utils)
  Release of celery 3.0 causes an import error at runtime upon any request.
  
  This is the stack trace:
  
  ```
  ImportError: cannot import name abbrtask
  Error handling request
  Traceback (most recent call last):
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/gunicorn/workers/sync.py", line 107, in handle_request
      for item in respiter:
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/raven/middleware.py", line 28, in __call__
      for event in self.application(environ, start_response):
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/wsgi.py", line 241, in __call__
      response = self.get_response(request)
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/base.py", line 179, in get_response
      response = self.handle_uncaught_exception(request, resolver, sys.exc_info())
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/base.py", line 224, in handle_uncaught_exception
      if resolver.urlconf_module is None:
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/urlresolvers.py", line 323, in urlconf_module
      self._urlconf_module = import_module(self.urlconf_name)
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/utils/importlib.py", line 35, in import_module
      __import__(name)
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/sentry/conf/urls.py", line 19, in <module>
      admin.autodiscover()
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/contrib/admin/__init__.py", line 29, in autodiscover
      import_module('%s.admin' % app)
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/django/utils/importlib.py", line 35, in import_module
      __import__(name)
    File "/Users/guzru/dev/django14/lib/python2.7/site-packages/djcelery/admin.py", line 19, in <module>
      from celery.utils import abbrtask
  ImportError: cannot import name abbrtask
  ```
  
  Requirements line for celery should become:
  
  celery>=2.5.3,<3.0.0
  
  
  --- END ISSUE ---
  
  Below are some code segments, each from a relevant file. One or more of these files may contain bugs.
  --- BEGIN FILES ---
  Path: `setup.py`
  Content:
  ```
  1 #!/usr/bin/env python
  2 """
  3 Sentry
  4 ======
  5 
  6 Sentry is a realtime event logging and aggregation platform. It specializes
  7 in monitoring errors and extracting all the information needed to do a proper
  8 post-mortem without any of the hassle of the standard user feedback loop.
  9 
  10 Sentry is a Server
  11 ------------------
  12 
  13 The Sentry package, at its core, is just a simple server and web UI. It will
  14 handle authentication clients (such as `Raven <https://github.com/dcramer/raven>`_)
  15 and all of the logic behind storage and aggregation.
  16 
  17 That said, Sentry is not limited to Python. The primary implementation is in
  18 Python, but it contains a full API for sending events from any language, in
  19 any application.
  20 
  21 :copyright: (c) 2011-2012 by the Sentry Team, see AUTHORS for more details.
  22 :license: BSD, see LICENSE for more details.
  23 """
  24 
  25 from setuptools import setup, find_packages
  26 
  27 # Hack to prevent stupid "TypeError: 'NoneType' object is not callable" error
  28 # in multiprocessing/util.py _exit_function when running `python
  29 # setup.py test` (see
  30 # http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)
  31 try:
  32     import multiprocessing
  33 except ImportError:
  34     pass
  35 
  36 tests_require = [
  37     'django-nose==1.1',
  38     'eventlet==0.9.16',
  39     'nose==1.1.2',
  40     'nydus==0.8.2',
  41     'mock==0.8.0',
  42     'pyflakes',
  43     'pep8',
  44     'redis',
  45     'unittest2',
  46 ]
  47 
  48 
  49 install_requires = [
  50     'cssutils>=0.9.9',
  51     'BeautifulSoup>=3.2.1',
  52     'django-celery>=2.5.5,<3.0',
  53     'django-crispy-forms>=1.1.4',
  54     'Django>=1.2,<1.5',
  55     'django-indexer>=0.3.0',
  56     'django-paging>=0.2.4',
  57     'django-picklefield>=0.2.0',
  58     'django-templatetag-sugar>=0.1.0',
  59     'gunicorn>=0.13.4',
  60     'logan>=0.3.1',
  61     'pynliner>=0.4.0',
  62     'python-dateutil>=1.5.0,<2.0.0',
  63     'pytz>=2011n',
  64     'raven>=2.0.0',
  65     'simplejson>=2.3.0,<2.5.0',
  66     'South>=0.7',
  67     'httpagentparser>=1.0.5'
  68 ]
  69 
  70 dependency_links = [
  71     'https://github.com/dcramer/pyflakes/tarball/master#egg=pyflakes',
  72 ]
  73 
  74 setup(
  75     name='sentry',
  76     version='4.8.1',
  77     author='David Cramer',
  78     author_email='dcramer@gmail.com',
  79     url='http://github.com/dcramer/sentry',
  80     description='A realtime logging and aggregation server.',
  81     long_description=__doc__,
  82     packages=find_packages(exclude=['tests']),
  83     zip_safe=False,
  84     install_requires=install_requires,
  85     tests_require=tests_require,
  86     extras_require={'test': tests_require},
  87     dependency_links=dependency_links,
  88     test_suite='runtests.runtests',
  89     license='BSD',
  90     include_package_data=True,
  91     entry_points={
  92         'console_scripts': [
  93             'sentry = sentry.utils.runner:main',
  94         ],
  95     },
  96     classifiers=[
  97         'Framework :: Django',
  98         'Intended Audience :: Developers',
  99         'Intended Audience :: System Administrators',
  100         'Operating System :: OS Independent',
  101         'Topic :: Software Development'
  102     ],
  103 )
  104
  ```
  --- END FILES ---
  
  Please first localize the bug based on the issue statement, and then generate a patch according to the `git diff` format fenced by three backticks.
  
  Here is an example:
  
  ```diff
  diff --git a/examples/server_async.py b/examples/server_async.py
  --- a/examples/server_async.py
  +++ b/examples/server_async.py
  @@ -313,4 +313,4 @@
   
   
   if __name__ == "__main__":
  -    asyncio.run(run_async_server("."), debug=True)
  +    asyncio.run(run_async_server(), debug=True)
  diff --git a/examples/server_sync.py b/examples/server_sync.py
  --- a/examples/server_sync.py
  +++ b/examples/server_sync.py
  @@ -313,5 +313,5 @@
   
   
   if __name__ == "__main__":
  -    server = run_sync_server(".")
  +    server = run_sync_server()
       server.shutdown()
  
  ```
  
golden_diff: diff --git a/setup.py b/setup.py
  --- a/setup.py
  +++ b/setup.py
  @@ -50,6 +50,7 @@
       'cssutils>=0.9.9',
       'BeautifulSoup>=3.2.1',
       'django-celery>=2.5.5,<3.0',
  +    'celery>=2.5.3,<3.0',
       'django-crispy-forms>=1.1.4',
       'Django>=1.2,<1.5',
       'django-indexer>=0.3.0',
  
verification_info: {"golden_diff": "diff --git a/setup.py b/setup.py\n--- a/setup.py\n+++ b/setup.py\n@@ -50,6 +50,7 @@\n     'cssutils>=0.9.9',\n     'BeautifulSoup>=3.2.1',\n     'django-celery>=2.5.5,<3.0',\n+    'celery>=2.5.3,<3.0',\n     'django-crispy-forms>=1.1.4',\n     'Django>=1.2,<1.5',\n     'django-indexer>=0.3.0',\n", "issue": "celery 3.0 causes import error (cannot import abbrtools from celery.utils)\nRelease of celery 3.0 causes an import error at runtime upon any request.\n\nThis is the stack trace:\n\n```\nImportError: cannot import name abbrtask\nError handling request\nTraceback (most recent call last):\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/gunicorn/workers/sync.py\", line 107, in handle_request\n    for item in respiter:\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/raven/middleware.py\", line 28, in __call__\n    for event in self.application(environ, start_response):\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/wsgi.py\", line 241, in __call__\n    response = self.get_response(request)\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/base.py\", line 179, in get_response\n    response = self.handle_uncaught_exception(request, resolver, sys.exc_info())\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/handlers/base.py\", line 224, in handle_uncaught_exception\n    if resolver.urlconf_module is None:\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/core/urlresolvers.py\", line 323, in urlconf_module\n    self._urlconf_module = import_module(self.urlconf_name)\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/utils/importlib.py\", line 35, in import_module\n    __import__(name)\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/sentry/conf/urls.py\", line 19, in <module>\n    admin.autodiscover()\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/contrib/admin/__init__.py\", line 29, in autodiscover\n    import_module('%s.admin' % app)\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/django/utils/importlib.py\", line 35, in import_module\n    __import__(name)\n  File \"/Users/guzru/dev/django14/lib/python2.7/site-packages/djcelery/admin.py\", line 19, in <module>\n    from celery.utils import abbrtask\nImportError: cannot import name abbrtask\n```\n\nRequirements line for celery should become:\n\ncelery>=2.5.3,<3.0.0\n\n", "before_files": [{"content": "#!/usr/bin/env python\n\"\"\"\nSentry\n======\n\nSentry is a realtime event logging and aggregation platform. It specializes\nin monitoring errors and extracting all the information needed to do a proper\npost-mortem without any of the hassle of the standard user feedback loop.\n\nSentry is a Server\n------------------\n\nThe Sentry package, at its core, is just a simple server and web UI. It will\nhandle authentication clients (such as `Raven <https://github.com/dcramer/raven>`_)\nand all of the logic behind storage and aggregation.\n\nThat said, Sentry is not limited to Python. The primary implementation is in\nPython, but it contains a full API for sending events from any language, in\nany application.\n\n:copyright: (c) 2011-2012 by the Sentry Team, see AUTHORS for more details.\n:license: BSD, see LICENSE for more details.\n\"\"\"\n\nfrom setuptools import setup, find_packages\n\n# Hack to prevent stupid \"TypeError: 'NoneType' object is not callable\" error\n# in multiprocessing/util.py _exit_function when running `python\n# setup.py test` (see\n# http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)\ntry:\n    import multiprocessing\nexcept ImportError:\n    pass\n\ntests_require = [\n    'django-nose==1.1',\n    'eventlet==0.9.16',\n    'nose==1.1.2',\n    'nydus==0.8.2',\n    'mock==0.8.0',\n    'pyflakes',\n    'pep8',\n    'redis',\n    'unittest2',\n]\n\n\ninstall_requires = [\n    'cssutils>=0.9.9',\n    'BeautifulSoup>=3.2.1',\n    'django-celery>=2.5.5,<3.0',\n    'django-crispy-forms>=1.1.4',\n    'Django>=1.2,<1.5',\n    'django-indexer>=0.3.0',\n    'django-paging>=0.2.4',\n    'django-picklefield>=0.2.0',\n    'django-templatetag-sugar>=0.1.0',\n    'gunicorn>=0.13.4',\n    'logan>=0.3.1',\n    'pynliner>=0.4.0',\n    'python-dateutil>=1.5.0,<2.0.0',\n    'pytz>=2011n',\n    'raven>=2.0.0',\n    'simplejson>=2.3.0,<2.5.0',\n    'South>=0.7',\n    'httpagentparser>=1.0.5'\n]\n\ndependency_links = [\n    'https://github.com/dcramer/pyflakes/tarball/master#egg=pyflakes',\n]\n\nsetup(\n    name='sentry',\n    version='4.8.1',\n    author='David Cramer',\n    author_email='dcramer@gmail.com',\n    url='http://github.com/dcramer/sentry',\n    description='A realtime logging and aggregation server.',\n    long_description=__doc__,\n    packages=find_packages(exclude=['tests']),\n    zip_safe=False,\n    install_requires=install_requires,\n    tests_require=tests_require,\n    extras_require={'test': tests_require},\n    dependency_links=dependency_links,\n    test_suite='runtests.runtests',\n    license='BSD',\n    include_package_data=True,\n    entry_points={\n        'console_scripts': [\n            'sentry = sentry.utils.runner:main',\n        ],\n    },\n    classifiers=[\n        'Framework :: Django',\n        'Intended Audience :: Developers',\n        'Intended Audience :: System Administrators',\n        'Operating System :: OS Independent',\n        'Topic :: Software Development'\n    ],\n)\n", "path": "setup.py"}], "after_files": [{"content": "#!/usr/bin/env python\n\"\"\"\nSentry\n======\n\nSentry is a realtime event logging and aggregation platform. It specializes\nin monitoring errors and extracting all the information needed to do a proper\npost-mortem without any of the hassle of the standard user feedback loop.\n\nSentry is a Server\n------------------\n\nThe Sentry package, at its core, is just a simple server and web UI. It will\nhandle authentication clients (such as `Raven <https://github.com/dcramer/raven>`_)\nand all of the logic behind storage and aggregation.\n\nThat said, Sentry is not limited to Python. The primary implementation is in\nPython, but it contains a full API for sending events from any language, in\nany application.\n\n:copyright: (c) 2011-2012 by the Sentry Team, see AUTHORS for more details.\n:license: BSD, see LICENSE for more details.\n\"\"\"\n\nfrom setuptools import setup, find_packages\n\n# Hack to prevent stupid \"TypeError: 'NoneType' object is not callable\" error\n# in multiprocessing/util.py _exit_function when running `python\n# setup.py test` (see\n# http://www.eby-sarna.com/pipermail/peak/2010-May/003357.html)\ntry:\n    import multiprocessing\nexcept ImportError:\n    pass\n\ntests_require = [\n    'django-nose==1.1',\n    'eventlet==0.9.16',\n    'nose==1.1.2',\n    'nydus==0.8.2',\n    'mock==0.8.0',\n    'pyflakes',\n    'pep8',\n    'redis',\n    'unittest2',\n]\n\n\ninstall_requires = [\n    'cssutils>=0.9.9',\n    'BeautifulSoup>=3.2.1',\n    'django-celery>=2.5.5,<3.0',\n    'celery>=2.5.3,<3.0',\n    'django-crispy-forms>=1.1.4',\n    'Django>=1.2,<1.5',\n    'django-indexer>=0.3.0',\n    'django-paging>=0.2.4',\n    'django-picklefield>=0.2.0',\n    'django-templatetag-sugar>=0.1.0',\n    'gunicorn>=0.13.4',\n    'logan>=0.3.1',\n    'pynliner>=0.4.0',\n    'python-dateutil>=1.5.0,<2.0.0',\n    'pytz>=2011n',\n    'raven>=2.0.0',\n    'simplejson>=2.3.0,<2.5.0',\n    'South>=0.7',\n    'httpagentparser>=1.0.5'\n]\n\ndependency_links = [\n    'https://github.com/dcramer/pyflakes/tarball/master#egg=pyflakes',\n]\n\nsetup(\n    name='sentry',\n    version='4.8.1',\n    author='David Cramer',\n    author_email='dcramer@gmail.com',\n    url='http://github.com/dcramer/sentry',\n    description='A realtime logging and aggregation server.',\n    long_description=__doc__,\n    packages=find_packages(exclude=['tests']),\n    zip_safe=False,\n    install_requires=install_requires,\n    tests_require=tests_require,\n    extras_require={'test': tests_require},\n    dependency_links=dependency_links,\n    test_suite='runtests.runtests',\n    license='BSD',\n    include_package_data=True,\n    entry_points={\n        'console_scripts': [\n            'sentry = sentry.utils.runner:main',\n        ],\n    },\n    classifiers=[\n        'Framework :: Django',\n        'Intended Audience :: Developers',\n        'Intended Audience :: System Administrators',\n        'Operating System :: OS Independent',\n        'Topic :: Software Development'\n    ],\n)\n", "path": "setup.py"}]}