fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-27 04:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

egl: fix python lib deprecation warning

Browse source 
DeprecationWarning: the imp module is deprecated in favour of importlib

Instead of complicated logic, just import the file directly.

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Eric Engestrom 2018-11-07 13:07:09 +00:00
parent b938d5fbef
commit bdf6a5c1d2
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/egl/Makefile.am
View file

@ -143,13 +143,11 @@ GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \
$(top_srcdir)/src/egl/generate/eglFunctionList.py \
$(top_srcdir)/src/egl/generate/egl.xml \
$(top_srcdir)/src/egl/generate/egl_other.xml > $@
g_egldispatchstubs.h: $(GLVND_GEN_DEPS)
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py header \
$(top_srcdir)/src/egl/generate/eglFunctionList.py \
$(top_srcdir)/src/egl/generate/egl.xml \
$(top_srcdir)/src/egl/generate/egl_other.xml > $@

7
src/egl/generate/gen_egl_dispatch.py
View file

@ -34,7 +34,7 @@ additional information defined in the module eglFunctionList.
import argparse
import collections
import imp
import eglFunctionList
import sys
import textwrap
@ -44,15 +44,10 @@ def main():
parser = argparse.ArgumentParser()
parser.add_argument("target", choices=("header", "source"),
help="Whether to build the source or header file.")
parser.add_argument("func_list_file", help="The function list .py file.")
parser.add_argument("xml_files", nargs="+", help="The XML files with the EGL function lists.")
args = parser.parse_args()
# The function list is a Python module, but it's specified on the command
# line.
eglFunctionList = imp.load_source("eglFunctionList", args.func_list_file)
xmlFunctions = genCommon.getFunctions(args.xml_files)
xmlByName = dict((f.name, f) for f in xmlFunctions)
functions = []

12
src/egl/meson.build
View file

@ -62,28 +62,28 @@ files_egl = files(
g_egldispatchstubs_c = custom_target(
'g_egldispatchstubs.c',
input : [
'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py',
'generate/gen_egl_dispatch.py',
'generate/egl.xml', 'generate/egl_other.xml'
],
output : 'g_egldispatchstubs.c',
command : [
prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@', '@INPUT3@'
prog_python, '@INPUT0@', 'source', '@INPUT1@', '@INPUT2@',
],
depend_files : files('generate/genCommon.py'),
depend_files : files('generate/eglFunctionList.py', 'generate/genCommon.py'),
capture : true,
)
g_egldispatchstubs_h = custom_target(
'g_egldispatchstubs.h',
input : [
'generate/gen_egl_dispatch.py', 'generate/eglFunctionList.py',
'generate/gen_egl_dispatch.py',
'generate/egl.xml', 'generate/egl_other.xml'
],
output : 'g_egldispatchstubs.h',
command : [
prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@', '@INPUT3@'
prog_python, '@INPUT0@', 'header', '@INPUT1@', '@INPUT2@',
],
depend_files : files('generate/genCommon.py'),
depend_files : files('generate/eglFunctionList.py', 'generate/genCommon.py'),
capture : true,
)