2to3 updates

Author: ask

celery/tests/app/test_amqp.py

@@ -4,6 +4,7 @@
 from mock import Mock
 
 from celery.app.amqp import Queues, TaskPublisher
+from celery.five import keys
 from celery.tests.case import AppCase
 
 
@@ -185,13 +186,13 @@ def test_select_add(self):
         q = Queues()
         q.select_subset(['foo', 'bar'])
         q.select_add('baz')
-        self.assertItemsEqual(q._consume_from.keys(), ['foo', 'bar', 'baz'])
+        self.assertItemsEqual(keys(q._consume_from), ['foo', 'bar', 'baz'])
 
     def test_select_remove(self):
         q = Queues()
         q.select_subset(['foo', 'bar'])
         q.select_remove('bar')
-        self.assertItemsEqual(q._consume_from.keys(), ['foo'])
+        self.assertItemsEqual(keys(q._consume_from), ['foo'])
 
     def test_with_ha_policy_compat(self):
         q = Queues(ha_policy='all')

celery/tests/utils/test_datastructures.py

@@ -40,7 +40,7 @@ def test_get_set_keys_values_items(self):
             list(x.items()),
         )
         self.assertIn('foo', list(x.keys()))
-        self.assertIn('The quick yellow fox', x.values())
+        self.assertIn('The quick yellow fox', list(x.values()))
 
     def test_setdefault(self):
         x = DictAttribute(Object())