Switch from cElementTree to ElementTree.

The xml.etree.cElementTree module will be removed in Python 3.9. Since
Python 3.3 the xml.etree.cElementTree module has been deprecated, the
xml.etree.ElementTree module uses a fast implementation whenever
available.

Builds using Python 2.7 can still work but with the slower
implementation.

Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5349>

diff --git a/src/amd/vulkan/radv_entrypoints_gen.py b/src/amd/vulkan/radv_entrypoints_gen.py
index 8b03b823e6cb3fb888312a8b9ebe4e0273eb8420..842f56d78af37477abc11ac9439b5c53a307531b 100644 (file)
--- a/src/amd/vulkan/radv_entrypoints_gen.py
+++ b/src/amd/vulkan/radv_entrypoints_gen.py
@@ -26,7 +26,7 @@ import argparse
 import functools
 import math
 import os
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 from collections import OrderedDict, namedtuple
 from mako.template import Template

diff --git a/src/freedreno/vulkan/tu_entrypoints_gen.py b/src/freedreno/vulkan/tu_entrypoints_gen.py
index 263ef6f05f44c46aa6b28eaff54ad1e0cb044673..85e620b572976e69b719daaa3e899b7a9deadbd8 100644 (file)
--- a/src/freedreno/vulkan/tu_entrypoints_gen.py
+++ b/src/freedreno/vulkan/tu_entrypoints_gen.py
@@ -27,7 +27,7 @@ import copy
 import functools
 import math
 import os
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 from collections import OrderedDict, namedtuple
 from mako.template import Template

diff --git a/src/intel/genxml/gen_sort_tags.py b/src/intel/genxml/gen_sort_tags.py
index 953c0fe55b8521b559ec108d655f4868bda0c8b5..f87bb2bfe6ef56ca3ee77a14c8e4ed21768bff4e 100755 (executable)
--- a/src/intel/genxml/gen_sort_tags.py
+++ b/src/intel/genxml/gen_sort_tags.py
@@ -28,7 +28,7 @@ from collections import OrderedDict
 import os
 import pathlib
 import re
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 def get_filename(element):
     return element.attrib['filename']

diff --git a/src/intel/genxml/gen_zipped_file.py b/src/intel/genxml/gen_zipped_file.py
index 199f550419e5a2c37818990ef1abd751936e9b47..fd91f175b161d5fb9360f3acc957a01da1e50e9a 100644 (file)
--- a/src/intel/genxml/gen_zipped_file.py
+++ b/src/intel/genxml/gen_zipped_file.py
@@ -25,7 +25,7 @@
 from __future__ import print_function
 import sys
 import zlib
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 def main():
     if len(sys.argv) < 2:

diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py
index dfe8e4dd25f7ab8c779f8ac5914b555a2e67c039..a5b47ea56e822ca27e042eb30711cc87de95c867 100644 (file)
--- a/src/intel/perf/gen_perf.py
+++ b/src/intel/perf/gen_perf.py
@@ -24,7 +24,7 @@ import os
 import sys
 import textwrap
 
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 hashed_funcs = {}
 

diff --git a/src/intel/vulkan/anv_entrypoints_gen.py b/src/intel/vulkan/anv_entrypoints_gen.py
index b524897a0f6ef60a9a648e4b5ffafe258518fc98..fc2ee09796103df71dcb70341019184cccca86e2 100644 (file)
--- a/src/intel/vulkan/anv_entrypoints_gen.py
+++ b/src/intel/vulkan/anv_entrypoints_gen.py
@@ -25,7 +25,7 @@
 import argparse
 import math
 import os
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 from collections import OrderedDict, namedtuple
 from mako.template import Template

diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py
index bf71de14891c743446429630f2e7b5ea57f2396a..ec8e9e7501993228cbd6184b92dbf8c06dc895f8 100644 (file)
--- a/src/mapi/new/genCommon.py
+++ b/src/mapi/new/genCommon.py
@@ -28,7 +28,7 @@
 import collections
 import re
 import sys
-import xml.etree.cElementTree as etree
+import xml.etree.ElementTree as etree
 
 import os
 GLAPI = os.path.join(os.path.dirname(__file__), "..", "glapi", "gen")

diff --git a/src/mapi/new/gen_gldispatch_mapi.py b/src/mapi/new/gen_gldispatch_mapi.py
index 86958de3007faf8b3be8aa7f56f937c01f5cc363..85596792e13040bfb1f5ea2f504c9f775bfbe03a 100755 (executable)
--- a/src/mapi/new/gen_gldispatch_mapi.py
+++ b/src/mapi/new/gen_gldispatch_mapi.py
@@ -33,7 +33,7 @@ Generates the glapi_mapi_tmp.h header file from Khronos's XML file.
 """
 
 import sys
-import xml.etree.cElementTree as etree
+import xml.etree.ElementTree as etree
 
 import genCommon
 

diff --git a/src/vulkan/util/gen_enum_to_str.py b/src/vulkan/util/gen_enum_to_str.py
index 035aa02a172325fddcdf75903fab3effc2da745e..ebaf2a1a0ccb1e923122dedd7c367832ecfb24a4 100644 (file)
--- a/src/vulkan/util/gen_enum_to_str.py
+++ b/src/vulkan/util/gen_enum_to_str.py
@@ -25,7 +25,7 @@ from __future__ import print_function
 import argparse
 import os
 import textwrap
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 from mako.template import Template
 

diff --git a/src/vulkan/util/vk_extensions.py b/src/vulkan/util/vk_extensions.py
index 2f8b1a784621bb2ccd6cc31740ef0dbd49e5d6c9..d01a43fd850c303b20823d7cc531f292f78b5ded 100644 (file)
--- a/src/vulkan/util/vk_extensions.py
+++ b/src/vulkan/util/vk_extensions.py
@@ -1,7 +1,7 @@
 import argparse
 import copy
 import re
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 def _bool_to_c_expr(b):
     if b is True:

diff --git a/src/vulkan/util/vk_extensions_gen.py b/src/vulkan/util/vk_extensions_gen.py
index e340761a67893bfd9b91f5bcb582e4a60d565ffd..bbfb60b3d81329608d67fe665a78243927735728 100644 (file)
--- a/src/vulkan/util/vk_extensions_gen.py
+++ b/src/vulkan/util/vk_extensions_gen.py
@@ -24,7 +24,7 @@ COPYRIGHT = """\
  */
 """
 
-import xml.etree.cElementTree as et
+import xml.etree.ElementTree as et
 
 from mako.template import Template