[Piglit] [PATCH 19/34] gen_builtin_uniform_tests.py: python2/3 hybridize

[Dylan Baker]

---
 generated_tests/gen_builtin_uniform_tests.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/generated_tests/gen_builtin_uniform_tests.py b/generated_tests/gen_builtin_uniform_tests.py
index 797d326..5919612 100644
--- a/generated_tests/gen_builtin_uniform_tests.py
+++ b/generated_tests/gen_builtin_uniform_tests.py
@@ -51,7 +51,8 @@ import numpy
 import optparse
 import os
 import os.path
-import sys
+
+from six.moves import range
 
 from modules import utils
 
@@ -282,12 +283,12 @@ class FloatComparator(Comparator):
             col_indexers = ['']
         else:
             col_indexers = ['[{0}]'.format(i)
-                            for i in xrange(self.__signature.rettype.num_cols)]
+                            for i in range(self.__signature.rettype.num_cols)]
         if self.__signature.rettype.num_rows == 1:
             row_indexers = ['']
         else:
             row_indexers = ['[{0}]'.format(i)
-                            for i in xrange(self.__signature.rettype.num_rows)]
+                            for i in range(self.__signature.rettype.num_rows)]
         return [col_indexer + row_indexer
                 for col_indexer in col_indexers
                 for row_indexer in row_indexers]
@@ -436,7 +437,7 @@ class ShaderTest(object):
         if self._signature.extension:
             shader += '#extension GL_{0} : require\n'.format(self._signature.extension)
         shader += additional_declarations
-        for i in xrange(len(self._signature.argtypes)):
+        for i in range(len(self._signature.argtypes)):
             shader += 'uniform {0} arg{1};\n'.format(
                 self._signature.argtypes[i], i)
         shader += self._comparator.make_additional_declarations()
@@ -446,7 +447,7 @@ class ShaderTest(object):
         shader += prefix_statements
         invocation = self._signature.template.format(
             *['arg{0}'.format(i)
-              for i in xrange(len(self._signature.argtypes))])
+              for i in range(len(self._signature.argtypes))])
         shader += self._comparator.make_result_handler(invocation, output_var)
         shader += suffix_statements
         shader += '}\n'
@@ -463,7 +464,7 @@ class ShaderTest(object):
         """
         test = self.make_test_init()
         for test_num, test_vector in enumerate(self._test_vectors):
-            for i in xrange(len(test_vector.arguments)):
+            for i in range(len(test_vector.arguments)):
                 test += 'uniform {0} arg{1} {2}\n'.format(
                     shader_runner_type(self._signature.argtypes[i]),
                     i, shader_runner_format(
-- 
2.3.0