Convert zip and map to list

to work towards Python3 support

Gbp-Dch: Ignore

diff --git a/gbp/log.py b/gbp/log.py
index 6d2c0a64dfe0e5c91c3399250f89ea6bb17d2089..27dc23d9f9fbac74f22bc18359685f648f71b52c 100644 (file)
--- a/gbp/log.py
+++ b/gbp/log.py
@@ -24,8 +24,8 @@ from logging import (DEBUG, INFO, WARNING, ERROR, CRITICAL, getLogger)
 import gbp.tristate
 
 
-COLORS = dict([('none', 0)] + zip(['black', 'red', 'green', 'yellow', 'blue',
-                                   'magenta', 'cyan', 'white'], range(30, 38)))
+COLORS = dict([('none', 0)] + list(zip(['black', 'red', 'green', 'yellow', 'blue',
+                                        'magenta', 'cyan', 'white'], range(30, 38))))
 DEFAULT_COLOR_SCHEME = {DEBUG: COLORS['green'],
                         INFO: COLORS['green'],
                         WARNING: COLORS['red'],

diff --git a/tests/test_GitRepository.py b/tests/test_GitRepository.py
index 30e25c20ffddfc6287d4b13823e0b163471fcd3b..4e344015466b24e34899a08a39e703efa8c75ff3 100644 (file)
--- a/tests/test_GitRepository.py
+++ b/tests/test_GitRepository.py
@@ -17,9 +17,9 @@ import gbp.log
 
 gbp.log.setup(color=False, verbose=True)
 
-repo_dir, bare_dir, clone_dir, mirror_clone_dir = map(
+repo_dir, bare_dir, clone_dir, mirror_clone_dir = list(map(
     lambda x, tmpdir=context.new_tmpdir(__name__): tmpdir.join(x),
-    ['repo', 'bare', 'clone', 'mirror_clone'])
+    ['repo', 'bare', 'clone', 'mirror_clone']))
 
 def test_create():
     """