Py3 fixes

celery/bin/base.py

@@ -80,7 +80,7 @@ from types import ModuleType
 
 import celery
 from celery.exceptions import CDeprecationWarning, CPendingDeprecationWarning
-from celery.five import items, string, string_t
+from celery.five import items, string, string_t, values
 from celery.platforms import (
     EX_FAILURE, EX_OK, EX_USAGE,
     maybe_patch_concurrency,
@@ -442,7 +442,7 @@ class Command(object):
                     return self.find_app('{0}.celery:'.format(
                                          app.replace(':', '')))
                 from celery.app.base import Celery
-                for suspect in vars(sym).itervalues():
+                for suspect in values(vars(sym)):
                     if isinstance(suspect, Celery):
                         return suspect
                 raise

celery/tests/utilities/test_datastructures.py

@@ -193,7 +193,7 @@ class test_LRUCache(Case):
     def test_update_expires(self):
         limit = 100
         x = LRUCache(limit=limit)
-        slots = list(xrange(limit * 2))
+        slots = list(range(limit * 2))
         for i in slots:
             x.update({i: i})
 

celery/worker/job.py

@@ -135,9 +135,9 @@ class Request(object):
         if eta is not None:
             try:
                 self.eta = maybe_iso8601(eta)
-            except (AttributeError, ValueError), exc:
+            except (AttributeError, ValueError) as exc:
                 raise InvalidTaskError(
-                    'invalid eta value %r: %s' % (eta, exc, ))
+                    'invalid eta value {0!r}: {1}'.format(eta, exc))
             if utc:
                 self.eta = maybe_make_aware(self.eta, self.tzlocal)
         else:
@@ -145,9 +145,9 @@ class Request(object):
         if expires is not None:
             try:
                 self.expires = maybe_iso8601(expires)
-            except (AttributeError, ValueError), exc:
+            except (AttributeError, ValueError) as exc:
                 raise InvalidTaskError(
-                    'invalid expires value %r: %s' % (expires, exc, ))
+                    'invalid expires value {0!r}: {1}'.format(expires, exc))
             if utc:
                 self.expires = maybe_make_aware(self.expires, self.tzlocal)
         else: