summaryrefslogtreecommitdiffstats
path: root/bin/scons-diff.py
diff options
context:
space:
mode:
authorStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 15:13:02 (GMT)
committerStefan Zimmermann <zimmermann.code@gmail.com>2014-03-31 15:13:02 (GMT)
commit1a1a11122ad28df19d305af879ba79a2b08ce7d4 (patch)
tree4464eb544fe0cc698ea4d1c5789e19770b83cd6f /bin/scons-diff.py
parent9f36c5b899b8d2d54cae8d3da76b01308c144ed6 (diff)
downloadSCons-1a1a11122ad28df19d305af879ba79a2b08ce7d4.zip
SCons-1a1a11122ad28df19d305af879ba79a2b08ce7d4.tar.gz
SCons-1a1a11122ad28df19d305af879ba79a2b08ce7d4.tar.bz2
Made former 2to3 changes Python 2.7 compatible (or removed unneeded changes).
Diffstat (limited to 'bin/scons-diff.py')
-rw-r--r--bin/scons-diff.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/scons-diff.py b/bin/scons-diff.py
index 5181fa1..8597501 100644
--- a/bin/scons-diff.py
+++ b/bin/scons-diff.py
@@ -8,6 +8,7 @@
# etc. so that you can diff trees without having to ignore changes in
# version lines.
#
+from __future__ import print_function
import difflib
import getopt
@@ -161,7 +162,7 @@ def diff_file(left, right):
else:
if text:
diff_line(left, right)
- print(text, end=' ')
+ print(text)
elif report_same:
print('Files %s and %s are identical' % (left, right))
@@ -173,7 +174,7 @@ def diff_dir(left, right):
u[l] = 1
for r in rlist:
u[r] = 1
- for x in sorted([ x for x in list(u.keys()) if x[-4:] != '.pyc' ]):
+ for x in sorted([ x for x in u.keys() if x[-4:] != '.pyc' ]):
if x in llist:
if x in rlist:
do_diff(os.path.join(left, x),