python: drop python2 support

Signed-off-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Jose Fonseca <jfonseca@vmware.com>
Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3674>

bin/install_megadrivers.py

@@ -22,7 +22,6 @@
 
 """Script to install megadriver symlinks for meson."""
 
-from __future__ import print_function
 import argparse
 import os
 

bin/meson_get_version.py

@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import print_function
 import os
 
 

src/amd/common/gfx10_format_table.py

@@ -24,8 +24,6 @@
 Script that generates the mapping from Gallium PIPE_FORMAT_xxx to GFX10_FORMAT_xxx enums.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import json
 import mako.template
 import os

src/amd/common/sid_tables.py

@@ -1,5 +1,3 @@
-from __future__ import print_function, division, unicode_literals
-
 CopyRight = '''
 /*
  * Copyright 2015-2019 Advanced Micro Devices, Inc.

src/amd/registers/canonicalize.py

@@ -33,8 +33,6 @@ Notes about deduced register types as well as the output JSON are printed on
 stdout.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from collections import defaultdict
 import json
 import re

src/amd/registers/makeregheader.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 COPYRIGHT = '''
 /*
  * Copyright 2015-2019 Advanced Micro Devices, Inc.

src/amd/registers/mergedbs.py

@@ -28,8 +28,6 @@ Helper script to merge register database JSON files.
 Will merge the given JSON files and output the result on stdout.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 from collections import defaultdict
 import json
 import re

src/amd/registers/parseheader.py

@@ -30,8 +30,6 @@ This script is included for reference -- we should be able to remove this in
 the future.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import json
 import math
 import re

src/amd/registers/regdb.py

@@ -24,8 +24,6 @@
 Python package containing common tools for manipulating register JSON.
 """
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import itertools
 import json
 import re

src/broadcom/cle/gen_pack_header.py

@@ -22,9 +22,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
 import xml.parsers.expat
 import re
 import sys

src/compiler/glsl/glcpp/tests/glcpp_test.py

@@ -21,7 +21,6 @@
 
 """Run glcpp tests with various line endings."""
 
-from __future__ import print_function
 import argparse
 import difflib
 import errno

src/compiler/glsl/tests/lower_precision_test.py

@@ -19,7 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import print_function
 import sys
 import subprocess
 import tempfile

src/compiler/glsl/tests/optimization_test.py

@@ -21,7 +21,6 @@
 
 """Script to generate and run glsl optimization tests."""
 
-from __future__ import print_function
 import argparse
 import difflib
 import errno

src/compiler/glsl/tests/sexps.py

@@ -29,10 +29,6 @@
 
 import re
 import sys
-if sys.version_info >= (3, 0, 0):
-    STRING_TYPE = str
-else:
-    STRING_TYPE = unicode
 
 def check_sexp(sexp):
     """Verify that the argument is a proper sexp.
@@ -44,7 +40,7 @@ def check_sexp(sexp):
     if isinstance(sexp, list):
         for s in sexp:
             check_sexp(s)
-    elif not isinstance(sexp, (STRING_TYPE, bytes)):
+    elif not isinstance(sexp, (str, bytes)):
         raise Exception('Not a sexp: {0!r}'.format(sexp))
 
 def parse_sexp(sexp):
@@ -75,7 +71,7 @@ def sexp_to_string(sexp):
     """Convert a sexp, represented as nested lists containing strings,
     into a single string of the form parseable by mesa.
     """
-    if isinstance(sexp, STRING_TYPE):
+    if isinstance(sexp, str):
         return sexp
     if isinstance(sexp, bytes):
         return sexp.encode('utf-8')

src/compiler/glsl/tests/warnings_test.py

@@ -19,7 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import print_function
 import argparse
 import errno
 import os

src/compiler/nir/nir_algebraic.py

@@ -23,7 +23,6 @@
 # Authors:
 #    Jason Ekstrand (jason@jlekstrand.net)
 
-from __future__ import print_function
 import ast
 from collections import defaultdict
 import itertools
@@ -60,15 +59,6 @@ def get_c_opcode(op):
       else:
          return 'nir_op_' + op
 
-
-if sys.version_info < (3, 0):
-    integer_types = (int, long)
-    string_type = unicode
-
-else:
-    integer_types = (int, )
-    string_type = str
-
 _type_re = re.compile(r"(?P<type>int|uint|bool|float)?(?P<bits>\d+)?")
 
 def type_bits(type_str):
@@ -107,9 +97,9 @@ class Value(object):
          return Expression(val, name_base, varset)
       elif isinstance(val, Expression):
          return val
-      elif isinstance(val, string_type):
+      elif isinstance(val, str):
          return Variable(val, name_base, varset)
-      elif isinstance(val, (bool, float) + integer_types):
+      elif isinstance(val, (bool, float, int)):
          return Constant(val, name_base)
 
    def __init__(self, val, name, type_str):
@@ -246,7 +236,7 @@ class Constant(Value):
    def hex(self):
       if isinstance(self.value, (bool)):
          return 'NIR_TRUE' if self.value else 'NIR_FALSE'
-      if isinstance(self.value, integer_types):
+      if isinstance(self.value, int):
          return hex(self.value)
       elif isinstance(self.value, float):
          i = struct.unpack('Q', struct.pack('d', self.value))[0]
@@ -265,7 +255,7 @@ class Constant(Value):
    def type(self):
       if isinstance(self.value, (bool)):
          return "nir_type_bool"
-      elif isinstance(self.value, integer_types):
+      elif isinstance(self.value, int):
          return "nir_type_int"
       elif isinstance(self.value, float):
          return "nir_type_float"

src/compiler/nir/nir_builder_opcodes_h.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 template = """\
 /* Copyright (C) 2015 Broadcom
  *

src/compiler/nir/nir_constant_expressions.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 import re
 from nir_opcodes import opcodes
 from nir_opcodes import type_has_size, type_size, type_sizes, type_base_type

src/compiler/nir/nir_opcodes_c.py

@@ -23,8 +23,6 @@
 # Authors:
 #    Connor Abbott (cwabbott0@gmail.com)
 
-from __future__ import print_function
-
 from nir_opcodes import opcodes, type_sizes
 from mako.template import Template
 

src/compiler/nir/nir_opcodes_h.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 template = """\
 /* Copyright (C) 2014 Connor Abbott
  *

src/compiler/nir/nir_opt_algebraic.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Jason Ekstrand (jason@jlekstrand.net)
 
-from __future__ import print_function
-
 from collections import OrderedDict
 import nir_algebraic
 from nir_opcodes import type_sizes

src/freedreno/ir3/ir3_nir_imul.py

@@ -20,8 +20,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
-
 import argparse
 import sys
 

src/freedreno/ir3/ir3_nir_trig.py

@@ -20,8 +20,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
-
 import argparse
 import sys
 

src/gallium/auxiliary/indices/u_indices_gen.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 copyright = '''
 /*
  * Copyright 2009 VMware, Inc.

src/gallium/auxiliary/indices/u_unfilled_gen.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 copyright = '''
 /*
  * Copyright 2009 VMware, Inc.

src/gallium/drivers/r600/egd_tables.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 CopyRight = '''
 /*
  * Copyright 2015 Advanced Micro Devices, Inc.

src/gallium/drivers/swr/rasterizer/codegen/gen_archrast.py

@@ -20,7 +20,6 @@
 # IN THE SOFTWARE.
 
 # Python source
-from __future__ import print_function
 import os
 import sys
 import re

src/gallium/drivers/swr/rasterizer/codegen/gen_backends.py

@@ -20,9 +20,7 @@
 # IN THE SOFTWARE.
 
 # Python source
-# Compatible with Python2.X and Python3.X
 
-from __future__ import print_function
 import itertools
 import os
 import sys

src/gallium/drivers/swr/rasterizer/codegen/gen_common.py

@@ -20,7 +20,6 @@
 # IN THE SOFTWARE.
 
 # Python source
-from __future__ import print_function
 import os
 import errno
 import sys

src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.py

@@ -20,7 +20,6 @@
 # IN THE SOFTWARE.
 
 # Python source
-from __future__ import print_function
 import os
 import sys
 import knob_defs

src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py

@@ -19,7 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
 import os, sys, re
 from gen_common import *
 from argparse import FileType

src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_types.py

@@ -19,7 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
 import os, sys, re
 from gen_common import *
 from argparse import FileType

src/intel/compiler/brw_nir_trig_workarounds.py

@@ -31,8 +31,6 @@
 # amplitude slightly.  Apparently this also minimizes the error function,
 # reducing the maximum error from 0.00006 to about 0.00003.
 
-from __future__ import print_function
-
 import argparse
 import sys
 

src/intel/genxml/gen_bits_header.py

@@ -19,10 +19,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
-
 import argparse
 import os
 import xml.parsers.expat

src/intel/genxml/gen_pack_header.py

@@ -1,8 +1,5 @@
 #encoding=utf-8
 
-from __future__ import (
-    absolute_import, division, print_function, unicode_literals
-)
 import argparse
 import ast
 import xml.parsers.expat

src/intel/genxml/gen_zipped_file.py

@@ -22,7 +22,6 @@
 # IN THE SOFTWARE.
 #
 
-from __future__ import print_function
 import sys
 import zlib
 import xml.etree.ElementTree as et

src/intel/isl/gen_format_layout.py

@@ -21,18 +21,14 @@
 
 """Generates isl_format_layout.c."""
 
-from __future__ import absolute_import, division, print_function
 import argparse
 import csv
 import re
 
 from mako import template
 
-# Load the template, ensure that __future__.division is imported, and set the
+# Load the template and set the bytes encoding to be utf-8.
-# bytes encoding to be utf-8. This last bit is important to getting simple
+TEMPLATE = template.Template(output_encoding='utf-8',
-# consistent behavior for python 3 when we get there.
-TEMPLATE = template.Template(future_imports=['division'],
-                             output_encoding='utf-8',
                              text="""\
 /* This file is autogenerated by gen_format_layout.py. DO NOT EDIT! */
 

src/mapi/glapi/gen/glX_proto_common.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import gl_XML, glX_XML
 
 

src/mapi/glapi/gen/glX_proto_send.py

@@ -26,8 +26,6 @@
 #    Ian Romanick <idr@us.ibm.com>
 #    Jeremy Kolb <jkolb@brandeis.edu>
 
-from __future__ import division, print_function
-
 import argparse
 
 import gl_XML, glX_XML, glX_proto_common, license

src/mapi/glapi/gen/glX_proto_size.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 import sys, string
 

src/mapi/glapi/gen/gl_SPARC_asm.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/gl_XML.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 from collections import OrderedDict
 from decimal import Decimal
 import xml.etree.ElementTree as ET

src/mapi/glapi/gen/gl_apitemp.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import gl_XML, glX_XML

src/mapi/glapi/gen/gl_enums.py

@@ -25,8 +25,6 @@
 # Authors:
 #    Zack Rusin <zack@kde.org>
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/gl_genexec.py

@@ -24,8 +24,6 @@
 # _mesa_initialize_exec_table().  It is responsible for populating all
 # entries in the "exec" dispatch table that aren't dynamic.
 
-from __future__ import print_function
-
 import argparse
 import collections
 import license

src/mapi/glapi/gen/gl_gentable.py

@@ -29,8 +29,6 @@
 # Based on code ogiginally by:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/gl_marshal.py

@@ -20,8 +20,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
-
 import contextlib
 import getopt
 import gl_XML

src/mapi/glapi/gen/gl_marshal_h.py

@@ -20,8 +20,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
-
 import getopt
 import gl_XML
 import license

src/mapi/glapi/gen/gl_procs.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/gl_table.py

@@ -25,8 +25,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import gl_XML

src/mapi/glapi/gen/gl_x86-64_asm.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 import copy
 

src/mapi/glapi/gen/gl_x86_asm.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/remap_helper.py

@@ -23,8 +23,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-from __future__ import print_function
-
 import argparse
 
 import license

src/mapi/glapi/gen/typeexpr.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Ian Romanick <idr@us.ibm.com>
 
-from __future__ import print_function
-
 import copy
 
 class type_node(object):

src/mapi/mapi_abi.py

@@ -24,8 +24,6 @@
 # Authors:
 #    Chia-I Wu <olv@lunarg.com>
 
-from __future__ import print_function
-
 import sys
 # make it possible to import glapi
 import os

src/mesa/main/format_info.py

@@ -21,8 +21,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import division, print_function
-
 import format_parser as parser
 import sys
 

src/mesa/main/get_hash_generator.py

@@ -28,8 +28,6 @@
 # Generate a C header file containing hash tables of glGet parameter
 # names for each GL API. The generated file is to be included by glGet.c
 
-from __future__ import print_function
-
 import os, sys, getopt
 from collections import defaultdict
 import get_hash_params

src/util/format/u_format_pack.py

@@ -35,20 +35,11 @@
  */
 '''
 
-
-from __future__ import division, print_function
-
 import sys
 
 from u_format_parse import *
 
 
-if sys.version_info < (3, 0):
-    integer_types = (int, long)
-
-else:
-    integer_types = (int, )
-
 def inv_swizzles(swizzles):
     '''Return an array[4] of inverse swizzle terms'''
     '''Only pick the first matching value to avoid l8 getting blue and i8 getting alpha'''
@@ -220,7 +211,7 @@ def truncate_mantissa(x, bits):
     '''Truncate an integer so it can be represented exactly with a floating
     point mantissa'''
 
-    assert isinstance(x, integer_types)
+    assert isinstance(x, int)
 
     s = 1
     if x < 0:
@@ -244,7 +235,7 @@ def value_to_native(type, value):
     '''Get the value of unity for this type.'''
     if type.type == FLOAT:
         if type.size <= 32 \
-            and isinstance(value, integer_types):
+            and isinstance(value, int):
             return truncate_mantissa(value, 23)
         return value
     if type.type == FIXED:

src/util/format/u_format_parse.py

@@ -29,7 +29,6 @@
 '''
 
 
-from __future__ import division
 import copy
 
 VOID, UNSIGNED, SIGNED, FIXED, FLOAT = range(5)

src/util/format/u_format_table.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 CopyRight = '''
 /**************************************************************************
  *

src/util/format_srgb.py

@@ -1,5 +1,3 @@
-from __future__ import print_function
-
 CopyRight = '''
 /**************************************************************************
  *

src/util/xxd.py

@@ -22,7 +22,6 @@
 
 # Converts a file to a C/C++ #include containing a string
 
-from __future__ import unicode_literals
 import argparse
 import io
 import os

src/vulkan/util/gen_enum_to_str.py

@@ -21,7 +21,6 @@
 
 """Create enum to string functions for vulkan using vk.xml."""
 
-from __future__ import print_function
 import argparse
 import os
 import textwrap