From 6d5a4749b5df9101dd5872987d3458b4d9c0df8a Mon Sep 17 00:00:00 2001 From: Victor Stinner <victor.stinner@enovance.com> Date: Mon, 24 Mar 2014 18:17:44 +0100 Subject: [PATCH] Python 3: cast map() result to list On Python 3, map() returns a generator, not a list. Cast explicitly the result of map() to a list to get a list on Python 2 and Python 3. The cast is useless in Python 2, but it doesn't hurt performances: it's just a unit test. Change-Id: I87486b7dbc42507a6fd7886748a2e09735b6fc5b --- tests/test_multithreading.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_multithreading.py b/tests/test_multithreading.py index 1754f5dd..c12f20ca 100644 --- a/tests/test_multithreading.py +++ b/tests/test_multithreading.py @@ -141,7 +141,7 @@ class TestQueueFunctionManager(ThreadTestCase): input_queue.put('go boom') self.assertEqual(self.starting_thread_count, threading.active_count()) - error_strs = map(str, self.thread_manager.error.call_args_list) + error_strs = list(map(str, self.thread_manager.error.call_args_list)) self.assertEqual(1, len(error_strs)) self.assertTrue('Exception: I went boom!' in error_strs[0]) @@ -174,7 +174,7 @@ class TestQueueFunctionManager(ThreadTestCase): input_queue.put('item%d' % i if i % 2 == 0 else 'go boom') self.assertEqual(self.starting_thread_count, threading.active_count()) - error_strs = map(str, self.thread_manager.error.call_args_list) + error_strs = list(map(str, self.thread_manager.error.call_args_list)) self.assertEqual(10, len(error_strs)) self.assertTrue(all(['Exception: I went boom!' in s for s in error_strs])) @@ -196,7 +196,7 @@ class TestQueueFunctionManager(ThreadTestCase): input_queue.put('item%d' % i if i % 2 == 0 else 'c boom') self.assertEqual(self.starting_thread_count, threading.active_count()) - error_strs = map(str, self.thread_manager.error.call_args_list) + error_strs = list(map(str, self.thread_manager.error.call_args_list)) self.assertEqual(10, len(error_strs)) stringification = 'Client Boom: ' \ 'http://192.168.22.1:80/booze 404 to much no sir!'