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.

18 files changed, 19 insertions, 19 deletions

diff --git a/test/scons-time/func/chdir.py b/test/scons-time/func/chdir.py
index 0ce43404..1aea7ade 100644
--- a/test/scons-time/func/chdir.py
+++ b/test/scons-time/func/chdir.py
@@ -48,7 +48,7 @@ def _main():
 """
 
 expect = []
-for i in xrange(9):
+for i in range(9):
     i = str(i)
     test.subdir(i)
     test.profile_data('profs/foo-%s.prof' % i, '%s/prof.py' % i, '_main', input)
diff --git a/test/scons-time/func/glob.py b/test/scons-time/func/glob.py
index d3fd960d..62404044 100644
--- a/test/scons-time/func/glob.py
+++ b/test/scons-time/func/glob.py
@@ -43,7 +43,7 @@ def _main():
 """
 
 expect = []
-for i in xrange(9):
+for i in range(9):
     test.subdir(str(i))
     test.profile_data('foo-%s.prof' % i, '%s/prof.py' % i, '_main', input)
     expect.append((r'\d.\d\d\d %s/prof\.py:1\(_main\)' + '\n') % i)
diff --git a/test/scons-time/func/prefix.py b/test/scons-time/func/prefix.py
index fe3618f7..67a0c6ba 100644
--- a/test/scons-time/func/prefix.py
+++ b/test/scons-time/func/prefix.py
@@ -47,11 +47,11 @@ def _main():
 foo_lines = []
 bar_lines = []
 
-for i in xrange(2):
+for i in range(2):
     test.profile_data('foo-%s.prof' % i, 'prof.py', '_main', input)
     foo_lines.append(r'\d.\d\d\d prof\.py:1\(_main\)' + '\n')
 
-for i in xrange(4):
+for i in range(4):
     test.profile_data('bar-%s.prof' % i, 'prof.py', '_main', input)
     bar_lines.append(r'\d.\d\d\d prof\.py:1\(_main\)' + '\n')
 
diff --git a/test/scons-time/func/tail.py b/test/scons-time/func/tail.py
index 91fa6c80..afd3f839 100644
--- a/test/scons-time/func/tail.py
+++ b/test/scons-time/func/tail.py
@@ -44,7 +44,7 @@ def _main():
 """
 
 expect = []
-for i in xrange(9):
+for i in range(9):
     test.subdir(str(i))
     test.profile_data('foo-%s.prof' % i, '%s/prof.py' % i, '_main', input)
     expect.append((r'\d.\d\d\d %s/prof\.py:1\(_main\)' + '\n') % i)
diff --git a/test/scons-time/mem/chdir.py b/test/scons-time/mem/chdir.py
index 52dbd2cb..5bf618c7 100644
--- a/test/scons-time/mem/chdir.py
+++ b/test/scons-time/mem/chdir.py
@@ -43,7 +43,7 @@ lines = [
 
 line_fmt = '        1000         2000         3000         4000    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = os.path.join('logs', 'foo-%s.log' % i)
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/mem/glob.py b/test/scons-time/mem/glob.py
index 04d8b095..820021e7 100644
--- a/test/scons-time/mem/glob.py
+++ b/test/scons-time/mem/glob.py
@@ -38,7 +38,7 @@ lines = [
 
 line_fmt = '        1000         2000         3000         4000    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/mem/prefix.py b/test/scons-time/mem/prefix.py
index 5e64dad4..faca54da 100644
--- a/test/scons-time/mem/prefix.py
+++ b/test/scons-time/mem/prefix.py
@@ -43,7 +43,7 @@ line_fmt = '        1000         2000         3000         4000    %s\n'
 foo_lines = [ header ]
 bar_lines = [ header ]
 
-for i in xrange(3):
+for i in range(3):
     logfile_name = os.path.join('foo-%s.log' % i)
     test.fake_logfile(logfile_name)
     foo_lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/mem/tail.py b/test/scons-time/mem/tail.py
index 19f4036d..cd002740 100644
--- a/test/scons-time/mem/tail.py
+++ b/test/scons-time/mem/tail.py
@@ -40,7 +40,7 @@ lines = []
 
 line_fmt = '        1000         2000         3000         4000    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/obj/chdir.py b/test/scons-time/obj/chdir.py
index 5b7fe228..4b77f8ab 100644
--- a/test/scons-time/obj/chdir.py
+++ b/test/scons-time/obj/chdir.py
@@ -43,7 +43,7 @@ lines = [
 
 line_fmt = '       1101%(i)s        1102%(i)s        1103%(i)s        1104%(i)s    %(logfile_name)s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = os.path.join('logs', 'foo-%s.log' % i)
     test.fake_logfile(logfile_name, i)
     lines.append(line_fmt % locals())
diff --git a/test/scons-time/obj/glob.py b/test/scons-time/obj/glob.py
index 07ccccc3..2105355a 100644
--- a/test/scons-time/obj/glob.py
+++ b/test/scons-time/obj/glob.py
@@ -38,7 +38,7 @@ lines = [
 
 line_fmt = '        601%(i)s         602%(i)s         603%(i)s         604%(i)s    %(logfile_name)s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name, i)
     lines.append(line_fmt % locals())
diff --git a/test/scons-time/obj/prefix.py b/test/scons-time/obj/prefix.py
index e669cf28..0bee5f70 100644
--- a/test/scons-time/obj/prefix.py
+++ b/test/scons-time/obj/prefix.py
@@ -43,7 +43,7 @@ line_fmt = '       11010        11020        11030        11040    %s\n'
 foo_lines = [ header ]
 bar_lines = [ header ]
 
-for i in xrange(3):
+for i in range(3):
     logfile_name = os.path.join('foo-%s.log' % i)
     test.fake_logfile(logfile_name)
     foo_lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/obj/tail.py b/test/scons-time/obj/tail.py
index 9049c89c..341a905f 100644
--- a/test/scons-time/obj/tail.py
+++ b/test/scons-time/obj/tail.py
@@ -40,7 +40,7 @@ lines = []
 
 line_fmt = '       1501%(i)s        1502%(i)s        1503%(i)s        1504%(i)s    %(logfile_name)s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name, i)
     lines.append(line_fmt % locals())
diff --git a/test/scons-time/time/chdir.py b/test/scons-time/time/chdir.py
index ef340a10..762de759 100644
--- a/test/scons-time/time/chdir.py
+++ b/test/scons-time/time/chdir.py
@@ -43,7 +43,7 @@ lines = [
 
 line_fmt = '   11.123456    22.234567    33.345678    44.456789    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = os.path.join('logs', 'foo-%s.log' % i)
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/time/empty.py b/test/scons-time/time/empty.py
index d73db79d..a59a014c 100644
--- a/test/scons-time/time/empty.py
+++ b/test/scons-time/time/empty.py
@@ -41,7 +41,7 @@ lines = []
 line_fmt    = '   11.123456    22.234567    33.345678    44.456789    %s\n'
 empty_fmt   = '                                                       %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s-0.log' % i
     if i == 5:
         test.write(test.workpath(logfile_name), "")
diff --git a/test/scons-time/time/glob.py b/test/scons-time/time/glob.py
index d202e612..1a76d9fc 100644
--- a/test/scons-time/time/glob.py
+++ b/test/scons-time/time/glob.py
@@ -38,7 +38,7 @@ lines = [
 
 line_fmt = '   11.123456    22.234567    33.345678    44.456789    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/time/no-result.py b/test/scons-time/time/no-result.py
index baf06d77..fbd2de92 100644
--- a/test/scons-time/time/no-result.py
+++ b/test/scons-time/time/no-result.py
@@ -49,7 +49,7 @@ line_fmt = "%s 11.123456\n"
 
 lines = []
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s-0.log' % i
     if i == 5:
         test.write(test.workpath(logfile_name), "NO RESULTS HERE!\n")
diff --git a/test/scons-time/time/prefix.py b/test/scons-time/time/prefix.py
index d12287d5..00a1f52e 100644
--- a/test/scons-time/time/prefix.py
+++ b/test/scons-time/time/prefix.py
@@ -43,7 +43,7 @@ line_fmt = '   11.123456    22.234567    33.345678    44.456789    %s\n'
 foo_lines = [ header ]
 bar_lines = [ header ]
 
-for i in xrange(3):
+for i in range(3):
     logfile_name = os.path.join('foo-%s.log' % i)
     test.fake_logfile(logfile_name)
     foo_lines.append(line_fmt % logfile_name)
diff --git a/test/scons-time/time/tail.py b/test/scons-time/time/tail.py
index 372f7852..c89f9046 100644
--- a/test/scons-time/time/tail.py
+++ b/test/scons-time/time/tail.py
@@ -40,7 +40,7 @@ lines = []
 
 line_fmt = '   11.123456    22.234567    33.345678    44.456789    %s\n'
 
-for i in xrange(9):
+for i in range(9):
     logfile_name = 'foo-%s.log' % i
     test.fake_logfile(logfile_name)
     lines.append(line_fmt % logfile_name)