python: bulk convert zip to list

In py3, zip will return a iterator other than a list.
Convert it to a list to support both py2 and py3.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index 0fb60b4c87b3ed8e7710922a140cd75941512139..9d95e3a14d5c95f206f1e922d607b6496fa73ad2 100644 (file)
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -1398,9 +1398,9 @@ def replay(conversations,
         print(("we have %d accounts but %d conversations" %
                (accounts, conversations)), file=sys.stderr)
 
-    cstack = zip(sorted(conversations,
-                        key=lambda x: x.start_time, reverse=True),
-                 accounts)
+    cstack = list(zip(
+        sorted(conversations, key=lambda x: x.start_time, reverse=True),
+        accounts))
 
     # Set the process group so that the calling scripts are not killed
     # when the forked child processes are killed.

diff --git a/python/samba/tests/graph.py b/python/samba/tests/graph.py
index d1824bc3ef911d723fa30b80e4cc03d2e5002636..0a95afb1859723272d9b48cce89b96b017b6a80f 100644 (file)
--- a/python/samba/tests/graph.py
+++ b/python/samba/tests/graph.py
@@ -73,7 +73,7 @@ class DotFileTests(samba.tests.TestCaseInTempDir):
     def test_basic_dot_files(self):
         vertices = tuple('abcdefgh')
         all_edges = tuple(itertools.combinations(vertices, 2))
-        line_edges = zip(vertices[1:], vertices[:-1])
+        line_edges = list(zip(vertices[1:], vertices[:-1]))
         ring_edges = line_edges + [(vertices[0], vertices[-1])]
         no_edges = []
         # even join to even numbers, odd to odd