Python 2.6 doesn't support dict and set-comprehension

3 files changed, 12 insertions, 12 deletions

diff --git a/asyncio/tasks.py b/asyncio/tasks.py
index 765798a..10161ad 100644
--- a/asyncio/tasks.py
+++ b/asyncio/tasks.py
@@ -73,7 +73,7 @@ class Task(futures.Future):
         """
         if loop is None:
             loop = events.get_event_loop()
-        return {t for t in cls._all_tasks if t._loop is loop}
+        return set(t for t in cls._all_tasks if t._loop is loop)
 
     def __init__(self, coro, loop=None):
         assert iscoroutine(coro), repr(coro)  # Not a coroutine function!
diff --git a/tests/test_events.py b/tests/test_events.py
index 2e83884..2e22fd9 100644
--- a/tests/test_events.py
+++ b/tests/test_events.py
@@ -175,7 +175,7 @@ class MySubprocessProtocol(protocols.SubprocessProtocol):
         self.transport = None
         self.connected = futures.Future(loop=loop)
         self.completed = futures.Future(loop=loop)
-        self.disconnects = {fd: futures.Future(loop=loop) for fd in range(3)}
+        self.disconnects = dict((fd, futures.Future(loop=loop)) for fd in range(3))
         self.data = {1: b'', 2: b''}
         self.returncode = None
         self.got_data = {1: locks.Event(loop=loop),
diff --git a/tests/test_tasks.py b/tests/test_tasks.py
index 76554c3..9b7e0d9 100644
--- a/tests/test_tasks.py
+++ b/tests/test_tasks.py
@@ -508,8 +508,8 @@ class TaskTests(unittest.TestCase):
             loop=loop)
 
         done, pending = loop.run_until_complete(task)
-        self.assertEqual({b}, done)
-        self.assertEqual({a}, pending)
+        self.assertEqual(set((b,)), done)
+        self.assertEqual(set((a,)), pending)
         self.assertFalse(a.done())
         self.assertTrue(b.done())
         self.assertIsNone(b.result())
@@ -540,7 +540,7 @@ class TaskTests(unittest.TestCase):
             loop=self.loop)
 
         done, pending = self.loop.run_until_complete(task)
-        self.assertEqual({a, b}, done)
+        self.assertEqual(set((a, b)), done)
         self.assertTrue(a.done())
         self.assertIsNone(a.result())
         self.assertTrue(b.done())
@@ -570,8 +570,8 @@ class TaskTests(unittest.TestCase):
             loop=loop)
 
         done, pending = loop.run_until_complete(task)
-        self.assertEqual({b}, done)
-        self.assertEqual({a}, pending)
+        self.assertEqual(set((b,)), done)
+        self.assertEqual(set((a,)), pending)
         self.assertAlmostEqual(0, loop.time())
 
         # move forward to close generator
@@ -603,8 +603,8 @@ class TaskTests(unittest.TestCase):
                           loop=loop)
 
         done, pending = loop.run_until_complete(task)
-        self.assertEqual({b}, done)
-        self.assertEqual({a}, pending)
+        self.assertEqual(set((b,)), done)
+        self.assertEqual(set((a,)), pending)
         self.assertAlmostEqual(0.01, loop.time())
 
         # move forward to close generator
@@ -801,7 +801,7 @@ class TaskTests(unittest.TestCase):
 
         a = tasks.sleep(0.05, 'a', loop=loop)
         b = tasks.sleep(0.10, 'b', loop=loop)
-        fs = {a, b}
+        fs = set((a, b))
         futs = list(tasks.as_completed(fs, loop=loop))
         self.assertEqual(len(futs), 2)
 
@@ -827,12 +827,12 @@ class TaskTests(unittest.TestCase):
 
         a = tasks.sleep(0.05, 'a', loop=loop)
         b = tasks.sleep(0.05, 'b', loop=loop)
-        fs = {a, b}
+        fs = set((a, b))
         futs = list(tasks.as_completed(fs, loop=loop))
         self.assertEqual(len(futs), 2)
         waiter = tasks.wait(futs, loop=loop)
         done, pending = loop.run_until_complete(waiter)
-        self.assertEqual(set(f.result() for f in done), {'a', 'b'})
+        self.assertEqual(set(f.result() for f in done), set(('a', 'b')))
 
     def test_sleep(self):