diff options
| author | Greg Noel <GregNoel@tigris.org> | 2010-03-29 14:21:04 +0000 |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2010-03-29 14:21:04 +0000 |
| commit | 238a7bdb01614c5d6b81fdebadd069bc40a61d23 (patch) | |
| tree | de2e680e944eb3c51fe1ba93714beba4605b18f4 /timings | |
| parent | 7adebb06bb6055345cc584377159d8052ea39e1b (diff) | |
| download | scons-git-238a7bdb01614c5d6b81fdebadd069bc40a61d23.tar.gz | |
http://scons.tigris.org/issues/show_bug.cgi?id=2345
The 'buffer' fixer simply replaces 'buffer( ... )' with 'memoryview( ... )',
which is incorrect for our cases, so these changes had to be done by hand and
a forward-compatibility class added.
The 'xrange' fixer was applied. Manual changes were minimal: a few case in
test strings and one use of 'range' as an identifer in the same scope as
where 'xrange' was converted to 'range'.
The "sets15" compat function, which provided backward compatibility for Python
versions prior to 2.2, was removed as no longer needed.
Diffstat (limited to 'timings')
| -rw-r--r-- | timings/CPPPATH/SConstruct | 2 | ||||
| -rw-r--r-- | timings/CPPPATH/TimeSCons-run.py | 2 | ||||
| -rw-r--r-- | timings/hundred/SConstruct | 4 | ||||
| -rw-r--r-- | timings/hundred/TimeSCons-run.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/timings/CPPPATH/SConstruct b/timings/CPPPATH/SConstruct index d49e3d63f..14cc76926 100644 --- a/timings/CPPPATH/SConstruct +++ b/timings/CPPPATH/SConstruct @@ -23,7 +23,7 @@ dir_count = int(ARGUMENTS['DIR_COUNT']) -inc_list = [ Dir('inc_%04d' % t) for t in xrange(dir_count) ] +inc_list = [ Dir('inc_%04d' % t) for t in range(dir_count) ] inc_list.append(Dir('include')) env = Environment(CPPPATH = inc_list) diff --git a/timings/CPPPATH/TimeSCons-run.py b/timings/CPPPATH/TimeSCons-run.py index 97d9e053e..b26fafcf2 100644 --- a/timings/CPPPATH/TimeSCons-run.py +++ b/timings/CPPPATH/TimeSCons-run.py @@ -47,7 +47,7 @@ import TestSCons test = TestSCons.TimeSCons(variables={'DIR_COUNT':813}) -for d in xrange(test.variables['DIR_COUNT']): +for d in range(test.variables['DIR_COUNT']): test.subdir('inc_%04d' % d) test.main() diff --git a/timings/hundred/SConstruct b/timings/hundred/SConstruct index c824b8879..b321d1085 100644 --- a/timings/hundred/SConstruct +++ b/timings/hundred/SConstruct @@ -27,8 +27,8 @@ def copy_files( env, target, source ): for t, s in zip(target, source): open(str(t), 'wb').write(open(str(s), 'rb').read()) -source_list = ['source_%04d' % t for t in xrange(target_count)] -target_list = ['target_%04d' % t for t in xrange(target_count)] +source_list = ['source_%04d' % t for t in range(target_count)] +target_list = ['target_%04d' % t for t in range(target_count)] env = Environment() diff --git a/timings/hundred/TimeSCons-run.py b/timings/hundred/TimeSCons-run.py index c90c26b96..3d5b02f9e 100644 --- a/timings/hundred/TimeSCons-run.py +++ b/timings/hundred/TimeSCons-run.py @@ -46,7 +46,7 @@ import TestSCons test = TestSCons.TimeSCons(variables={'TARGET_COUNT':139}) -for t in xrange(test.variables['TARGET_COUNT']): +for t in range(test.variables['TARGET_COUNT']): open('source_%04d' % t, 'wb' ).write('contents\n') test.main() |