summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-09-27 19:54:42 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-11-12 16:46:36 (GMT)
commitc118af22cd8336c487da11aa2890a8807e712d7f (patch)
tree1a038495810d290956857374dbe8dadf966684ba /src/engine/SCons
parent1cd374a5d56698a669f544cf3226edb2b7ac353d (diff)
downloadSCons-c118af22cd8336c487da11aa2890a8807e712d7f.zip
SCons-c118af22cd8336c487da11aa2890a8807e712d7f.tar.gz
SCons-c118af22cd8336c487da11aa2890a8807e712d7f.tar.bz2
switch from izip to zip. no izip in py3
Diffstat (limited to 'src/engine/SCons')
-rw-r--r--src/engine/SCons/Node/FS.py4
-rw-r--r--src/engine/SCons/Node/__init__.py2
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)