From c118af22cd8336c487da11aa2890a8807e712d7f Mon Sep 17 00:00:00 2001 From: William Deegan Date: Thu, 27 Sep 2018 12:54:42 -0700 Subject: switch from izip to zip. no izip in py3 --- src/engine/SCons/Node/FS.py | 4 ++-- src/engine/SCons/Node/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 605e80b..06f6a6a 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -43,7 +43,7 @@ import stat import sys import time import codecs -from itertools import izip, chain +from itertools import chain import SCons.Action import SCons.Debug @@ -3301,7 +3301,7 @@ class File(Base): # store this info so we can avoid regenerating it. - binfo.dependency_map = { str(child):signature for child, signature in izip(chain(binfo.bsources, binfo.bdepends, binfo.bimplicit), + binfo.dependency_map = { str(child):signature for child, signature in zip(chain(binfo.bsources, binfo.bdepends, binfo.bimplicit), chain(binfo.bsourcesigs, binfo.bdependsigs, binfo.bimplicitsigs))} return binfo.dependency_map diff --git a/src/engine/SCons/Node/__init__.py b/src/engine/SCons/Node/__init__.py index f3f142f..af98891 100644 --- a/src/engine/SCons/Node/__init__.py +++ b/src/engine/SCons/Node/__init__.py @@ -1636,7 +1636,7 @@ class Node(object, with_metaclass(NoSlotsPyPy)): # so we only print them after running them through this lambda # to turn them into the right relative Node and then return # its string. - def stringify( s, E=self.dir.Entry ) : + def stringify( s, E=self.dir.Entry): if hasattr( s, 'dir' ) : return str(E(s)) return str(s) -- cgit v0.12