Fix zip filter for Python3

Using the now bundled six library. Fixes ansible#28117
viciu · Aug 15, 2017 · c9cdc3a · c9cdc3a
1 parent aee3f12
commit c9cdc3a
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/lib/ansible/plugins/filter/mathstuff.py b/lib/ansible/plugins/filter/mathstuff.py
@@ -26,6 +26,7 @@
 
 from ansible import errors
 from ansible.module_utils import basic
+from ansible.module_utils.six.moves import zip, zip_longest
 
 
 def unique(a):
@@ -153,17 +154,10 @@ def filters(self):
             'human_readable': human_readable,
             'human_to_bytes': human_to_bytes,
 
-        }
+            # zip
+            'zip': zip,
+            'zip_longest': zip_longest,
 
-        # py2 vs py3, reverse when py3 is predominant version
-        try:
-            filters['zip'] = itertools.izip
-            filters['zip_longest'] = itertools.izip_longest
-        except AttributeError:
-            try:
-                filters['zip'] = itertools.zip
-                filters['zip_longest'] = itertools.zip_longest
-            except:
-                pass
+        }
 
         return filters