Fixes some tests

celery/app/utils.py

@@ -159,7 +159,7 @@ class Settings(ConfigurationView):
         configuration."""
         return '\n'.join(
             '{0}: {1}'.format(key, pretty(value, width=50))
-            for key, value in self.table(with_defaults, censored.items()))
+            for key, value in self.table(with_defaults, censored).items())
 
 
 def _new_key_to_old(key, convert=_TO_OLD_KEY.get):

celery/backends/consul.py

@@ -7,7 +7,7 @@
 from kombu.utils.url import parse_url
 
 from celery.exceptions import ImproperlyConfigured
-from celery.backends.base import KeyValueStoreBackend, PY3
+from celery.backends.base import KeyValueStoreBackend
 from celery.utils.log import get_logger
 
 try:
@@ -50,8 +50,7 @@ class ConsulBackend(KeyValueStoreBackend):
                                     consistency=self.consistency)
 
     def _key_to_consul_key(self, key):
-        if PY3:
-            key = key.encode('utf-8')
+        key = key.encode('utf-8')
         return key if self.path is None else '{0}/{1}'.format(self.path, key)
 
     def get(self, key):
@@ -78,9 +77,7 @@ class ConsulBackend(KeyValueStoreBackend):
         If the session expires it will remove the key so that results
         can auto expire from the K/V store
         """
-        session_name = key
-        if PY3:
-            session_name = key.decode('utf-8')
+        session_name = key.decode('utf-8')
         key = self._key_to_consul_key(key)
 
         logger.debug('Trying to create Consul session %s with TTL %d',

celery/tests/bin/test_multi.py

@@ -388,8 +388,7 @@ class test_MultiTool(AppCase):
     def test_node_alive(self, kill):
         kill.return_value = True
         self.assertTrue(self.t.node_alive(13))
-        esrch = OSError()
-        esrch.errno = errno.ESRCH
+        esrch = ProcessLookupError()
         kill.side_effect = esrch
         self.assertFalse(self.t.node_alive(13))
         kill.assert_called_with(13, 0)
@@ -404,8 +403,7 @@ class test_MultiTool(AppCase):
     def test_signal_node(self, kill):
         kill.return_value = True
         self.assertTrue(self.t.signal_node('foo', 13, 9))
-        esrch = OSError()
-        esrch.errno = errno.ESRCH
+        esrch = ProcessLookupError()
         kill.side_effect = esrch
         self.assertFalse(self.t.signal_node('foo', 13, 9))
         kill.assert_called_with(13, 9)

celery/tests/concurrency/test_concurrency.py

@@ -77,16 +77,6 @@ class test_BasePool(AppCase):
         apply_target(target, callback=callback)
         callback.assert_called()
 
-    @patch('celery.concurrency.base.reraise')
-    def test_apply_target__raises_BaseException_raises_else(self, reraise):
-        target = Mock(name='target')
-        callback = Mock(name='callback')
-        reraise.side_effect = KeyError()
-        target.side_effect = BaseException()
-        with self.assertRaises(KeyError):
-            apply_target(target, callback=callback)
-        callback.assert_not_called()
-
     def test_does_not_debug(self):
         x = BasePool(10)
         x._does_debug = False

celery/utils/functional.py

@@ -47,7 +47,7 @@ class mlazy(lazy):
 
     def evaluate(self):
         if not self.evaluated:
-            self._value = super(mlazy, self).evaluate()
+            self._value = super().evaluate()
             self.evaluated = True
         return self._value