From: Mathieu Bridon Date: Thu, 9 Aug 2018 08:27:20 +0000 (+0200) Subject: python: Explicitly use a list X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c644b2d7a7602e929b92dd2c52ed2765928e02b1;p=mesa.git python: Explicitly use a list On Python 2, the builtin functions filter() returns a list. On Python 3, it returns an iterator. Since we want to use those objects in contexts where we need lists, we need to explicitly turn them into lists. This makes the code compatible with both Python 2 and Python 3. Signed-off-by: Mathieu Bridon Reviewed-by: Dylan Baker --- diff --git a/src/mesa/main/get_hash_generator.py b/src/mesa/main/get_hash_generator.py index facdccd8a53..37dae45e0b3 100644 --- a/src/mesa/main/get_hash_generator.py +++ b/src/mesa/main/get_hash_generator.py @@ -117,8 +117,8 @@ def print_tables(tables): def merge_tables(tables): merged_tables = [] for api, indices in sorted(tables.items()): - matching_table = filter(lambda mt:mt["indices"] == indices, - merged_tables) + matching_table = list(filter(lambda mt:mt["indices"] == indices, + merged_tables)) if matching_table: matching_table[0]["apis"].append(api) else: