Py3 fixes

celery/app/builtins.py

@@ -99,7 +99,7 @@ def add_unlock_chord_task(app):
                 ret = j(propagate=propagate)
             except Exception as exc:
                 try:
-                    culprit = deps._failed_join_report().next()
+                    culprit = next(deps._failed_join_report())
                     reason = 'Dependency {0.id} raised {1!r}'.format(
                         culprit, exc,
                     )
@@ -112,10 +112,11 @@ def add_unlock_chord_task(app):
             else:
                 try:
                     callback.delay(ret)
-                except Exception, exc:
+                except Exception as exc:
                     app._tasks[callback.task].backend.fail_from_current_stack(
                         callback.id,
-                        exc=ChordError('Call callback error: %r' % (exc, )))
+                        exc=ChordError('Callback error: {0!r}'.format(exc)),
+                    )
         else:
             return unlock_chord.retry(countdown=interval,
                                       max_retries=max_retries)

celery/app/defaults.py

@@ -233,7 +233,7 @@ def find_deprecated_settings(source):
             warn_deprecated(description='The {0!r} setting'.format(name),
                             deprecation=opt.deprecate_by,
                             removal=opt.remove_by,
-                            alternative='Use %s instead' % (opt.alt, ))
+                            alternative='Use {0.alt} instead'.format(opt))
     return source
 
 

celery/worker/hub.py

@@ -158,7 +158,7 @@ class Hub(object):
                     entry()
                 except propagate:
                     raise
-                except Exception, exc:
+                except Exception as exc:
                     logger.error('Error in timer: %r', exc, exc_info=1)
         return min(max(delay or 0, min_delay), max_delay)
 

docs/conf.py

@@ -39,11 +39,20 @@ extensions = ['sphinx.ext.autodoc',
               'sphinxcontrib.issuetracker',
               'celerydocs']
 
+
+LINKCODE_URL = 'http://github.com/{proj}/tree/{branch}/{filename}.py'
+GITHUB_PROJECT = 'celery/celery'
+GITHUB_BRANCH = 'master'
+
 def linkcode_resolve(domain, info):
     if domain != 'py' or not info['module']:
         return
     filename = info['module'].replace('.', '/')
-    return 'http://github.com/celery/celery/tree/master/%s.py' % (filename, )
+    return LINKCODE_URL.format(
+        proj=GITHUB_PROJECT,
+        branch=GITHUB_BRANCH,
+        filename=FILENAME,
+    )
 
 html_show_sphinx = False
 

examples/celery_http_gateway/manage.py

@@ -5,8 +5,8 @@ try:
 except ImportError:
     import sys
     sys.stderr.write(
-        "Error: Can't find the file 'settings.py' in the directory \
-         containing %r." % __file__)
+        "Error: Can't find the file 'settings.py' in the directory "
+        "containing {0!r}.".format(__file__)
     sys.exit(1)
 
 if __name__ == '__main__':

examples/httpexample/manage.py

@@ -5,8 +5,8 @@ try:
 except ImportError:
     import sys
     sys.stderr.write(
-        "Error: Can't find the file 'settings.py' in the directory \
-         containing %r." % __file__)
+        "Error: Can't find the file 'settings.py' in the directory "
+        "containing {0!r}.".format(__file__)
     sys.exit(1)
 
 if __name__ == '__main__':