Switch from cElementTree to ElementTree.

[mesa.git] / src / mapi / new / genCommon.py

diff --git a/src/mapi/new/genCommon.py b/src/mapi/new/genCommon.py
index bfcf6ed3eea87f922b9ee89fee82f0a7ca173f6c..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")
@@ -92,9 +92,6 @@ def getFunctionsFromRoots(roots):
             functions[i] = functions[i]._replace(slot=next_slot)
             next_slot += 1
 
-    # Sort the function list by slot.... to simplify the diff
-    functions = sorted(functions, key=lambda f: f.slot)
-
     return functions
 
 def getExportNamesFromRoots(target, roots):
@@ -226,7 +223,7 @@ def _fixupTypeName(typeName):
     # Remove the vendor suffixes from types that have a suffix-less version.
     rv = re.sub(r"\b(GLhalf|GLintptr|GLsizeiptr|GLint64|GLuint64)(?:ARB|EXT|NV|ATI)\b", r"\1", rv)
 
-    rv = re.sub(r"\bGLvoid\b", "void", rv)
+    rv = re.sub(r"\bGLDEBUGPROCKHR\b", "GLDEBUGPROC", rv)
 
     # Clear out any leading and trailing whitespace.
     rv = rv.strip()