From a62b31f43fe80177801490c6eab0097340d4f323 Mon Sep 17 00:00:00 2001 From: David Seifert Date: Wed, 6 Apr 2022 19:57:30 +0200 Subject: [PATCH] Use portable python shebangs * In conda or Gentoo Prefix, we don't want to use the system python and instead rely on PATH lookup. --- build_glob.py | 2 +- check-relaxng-test-suite.py | 2 +- check-relaxng-test-suite2.py | 2 +- check-xinclude-test-suite.py | 2 +- check-xml-test-suite.py | 2 +- check-xsddata-test-suite.py | 2 +- doc/apibuild.py | 2 +- doc/examples/index.py | 2 +- genChRanges.py | 2 +- genUnicode.py | 2 +- gentest.py | 2 +- libxml.spec.in | 2 +- python/generator.py | 2 +- python/setup.py.in | 2 +- python/tests/attribs.py | 2 +- python/tests/build.py | 2 +- python/tests/compareNodes.py | 2 +- python/tests/ctxterror.py | 2 +- python/tests/cutnpaste.py | 2 +- python/tests/dtdvalid.py | 2 +- python/tests/error.py | 2 +- python/tests/inbuf.py | 2 +- python/tests/indexes.py | 2 +- python/tests/input_callback.py | 2 +- python/tests/nsdel.py | 2 +- python/tests/outbuf.py | 2 +- python/tests/push.py | 2 +- python/tests/pushSAX.py | 2 +- python/tests/pushSAXhtml.py | 2 +- python/tests/reader.py | 2 +- python/tests/reader2.py | 2 +- python/tests/reader3.py | 2 +- python/tests/reader4.py | 2 +- python/tests/reader5.py | 2 +- python/tests/reader6.py | 2 +- python/tests/reader7.py | 2 +- python/tests/reader8.py | 2 +- python/tests/readererr.py | 2 +- python/tests/readernext.py | 2 +- python/tests/regexp.py | 2 +- python/tests/relaxng.py | 2 +- python/tests/resolver.py | 2 +- python/tests/schema.py | 2 +- python/tests/serialize.py | 2 +- python/tests/sync.py | 2 +- python/tests/thread2.py | 2 +- python/tests/tst.py | 2 +- python/tests/tstLastError.py | 2 +- python/tests/tstURI.py | 2 +- python/tests/tstmem.py | 2 +- python/tests/tstxpath.py | 2 +- python/tests/validDTD.py | 2 +- python/tests/validRNG.py | 2 +- python/tests/validSchemas.py | 2 +- python/tests/validate.py | 2 +- python/tests/walker.py | 2 +- python/tests/xpath.py | 2 +- python/tests/xpathext.py | 2 +- python/tests/xpathleak.py | 2 +- python/tests/xpathns.py | 2 +- python/tests/xpathret.py | 2 +- xstc/fixup-tests.py | 2 +- xstc/xstc-to-python.xsl | 2 +- 63 files changed, 63 insertions(+), 63 deletions(-) diff --git a/build_glob.py b/build_glob.py index 46d6288f..750fd70e 100755 --- a/build_glob.py +++ b/build_glob.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python +#!/usr/bin/env python ### # # build_glob.py : Build the global_functions.h and global_functions.c diff --git a/check-relaxng-test-suite.py b/check-relaxng-test-suite.py index aa89cded..87ec0500 100755 --- a/check-relaxng-test-suite.py +++ b/check-relaxng-test-suite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import time import os diff --git a/check-relaxng-test-suite2.py b/check-relaxng-test-suite2.py index 5bba5a40..559503a1 100755 --- a/check-relaxng-test-suite2.py +++ b/check-relaxng-test-suite2.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import time import os diff --git a/check-xinclude-test-suite.py b/check-xinclude-test-suite.py index e8034405..926ceb3c 100755 --- a/check-xinclude-test-suite.py +++ b/check-xinclude-test-suite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import time import os diff --git a/check-xml-test-suite.py b/check-xml-test-suite.py index 953a76cb..cecb59b7 100755 --- a/check-xml-test-suite.py +++ b/check-xml-test-suite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import time import os diff --git a/check-xsddata-test-suite.py b/check-xsddata-test-suite.py index 9ed72aa2..c34560ea 100755 --- a/check-xsddata-test-suite.py +++ b/check-xsddata-test-suite.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys import time import os diff --git a/doc/apibuild.py b/doc/apibuild.py index ecbb9617..6fd6b842 100755 --- a/doc/apibuild.py +++ b/doc/apibuild.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # This is the API builder, it parses the C sources and build the # API formal description in XML. diff --git a/doc/examples/index.py b/doc/examples/index.py index 1d5600d1..599f89aa 100755 --- a/doc/examples/index.py +++ b/doc/examples/index.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # Indexes the examples and build an XML description # diff --git a/genChRanges.py b/genChRanges.py index 827560ab..c6252fcb 100755 --- a/genChRanges.py +++ b/genChRanges.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # Portions of this script have been (shamelessly) stolen from the # prior work of Daniel Veillard (genUnicode.py) diff --git a/genUnicode.py b/genUnicode.py index f431201f..794ea087 100755 --- a/genUnicode.py +++ b/genUnicode.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # Original script modified in November 2003 to take advantage of # the character-validation range routines, and updated to the diff --git a/gentest.py b/gentest.py index 6fa044a3..ee0b93fb 100755 --- a/gentest.py +++ b/gentest.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # generate a tester program for the API # diff --git a/libxml.spec.in b/libxml.spec.in index ea593d0e..45083de7 100644 --- a/libxml.spec.in +++ b/libxml.spec.in @@ -99,7 +99,7 @@ at parse time or later once the document has been modified. mkdir py3doc cp doc/*.py py3doc -sed -i 's|#!/usr/bin/python |#!%{__python3} |' py3doc/*.py +sed -i 's|#!/usr/bin/env python|#!/usr/bin/env %{__python3}|' py3doc/*.py %build %configure diff --git a/python/generator.py b/python/generator.py index 06ab655f..1188952e 100755 --- a/python/generator.py +++ b/python/generator.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # generate python wrappers from the XML API description # diff --git a/python/setup.py.in b/python/setup.py.in index 557e4c7d..57505eb0 100755 --- a/python/setup.py.in +++ b/python/setup.py.in @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # Setup script for libxml2 and libxslt if found # diff --git a/python/tests/attribs.py b/python/tests/attribs.py index 99132c27..23def617 100755 --- a/python/tests/attribs.py +++ b/python/tests/attribs.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/build.py b/python/tests/build.py index b2d3f78e..05e4917a 100755 --- a/python/tests/build.py +++ b/python/tests/build.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/compareNodes.py b/python/tests/compareNodes.py index ca5a5a2e..a11855bf 100755 --- a/python/tests/compareNodes.py +++ b/python/tests/compareNodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/ctxterror.py b/python/tests/ctxterror.py index ac64624f..0aa0150d 100755 --- a/python/tests/ctxterror.py +++ b/python/tests/ctxterror.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # This test exercise the redirection of error messages with a # functions defined in Python. diff --git a/python/tests/cutnpaste.py b/python/tests/cutnpaste.py index 7787246b..b672ae07 100755 --- a/python/tests/cutnpaste.py +++ b/python/tests/cutnpaste.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/dtdvalid.py b/python/tests/dtdvalid.py index d4049b86..129b57ae 100755 --- a/python/tests/dtdvalid.py +++ b/python/tests/dtdvalid.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/error.py b/python/tests/error.py index 530c2ee2..e41c27e4 100755 --- a/python/tests/error.py +++ b/python/tests/error.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # This test exercise the redirection of error messages with a # functions defined in Python. diff --git a/python/tests/inbuf.py b/python/tests/inbuf.py index 0c166747..16ca9bcb 100755 --- a/python/tests/inbuf.py +++ b/python/tests/inbuf.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 try: diff --git a/python/tests/indexes.py b/python/tests/indexes.py index e41a0d92..4922b5e5 100755 --- a/python/tests/indexes.py +++ b/python/tests/indexes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # -*- coding: ISO-8859-1 -*- import sys import libxml2 diff --git a/python/tests/input_callback.py b/python/tests/input_callback.py index 495ab62f..2cb85dec 100755 --- a/python/tests/input_callback.py +++ b/python/tests/input_callback.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # This tests custom input callbacks # diff --git a/python/tests/nsdel.py b/python/tests/nsdel.py index 8558248c..b7f8b759 100755 --- a/python/tests/nsdel.py +++ b/python/tests/nsdel.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this test exercise the XPath basic engine, parser, etc, and # allows to detect memory leaks diff --git a/python/tests/outbuf.py b/python/tests/outbuf.py index 62761ccd..8e8ef247 100755 --- a/python/tests/outbuf.py +++ b/python/tests/outbuf.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 try: diff --git a/python/tests/push.py b/python/tests/push.py index 0edd61db..56864c33 100755 --- a/python/tests/push.py +++ b/python/tests/push.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/pushSAX.py b/python/tests/pushSAX.py index 48f6e82b..850ae7e1 100755 --- a/python/tests/pushSAX.py +++ b/python/tests/pushSAX.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/pushSAXhtml.py b/python/tests/pushSAXhtml.py index 159d3080..47cd8a53 100755 --- a/python/tests/pushSAXhtml.py +++ b/python/tests/pushSAXhtml.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/reader.py b/python/tests/reader.py index 173ce666..5a461460 100755 --- a/python/tests/reader.py +++ b/python/tests/reader.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # -*- coding: ISO-8859-1 -*- # # this tests the basic APIs of the XmlTextReader interface diff --git a/python/tests/reader2.py b/python/tests/reader2.py index ea8a17fc..65cecd47 100755 --- a/python/tests/reader2.py +++ b/python/tests/reader2.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # -*- coding: utf-8 -*- # # this tests the DTD validation with the XmlTextReader interface diff --git a/python/tests/reader3.py b/python/tests/reader3.py index 4302b6c4..39a7f73a 100755 --- a/python/tests/reader3.py +++ b/python/tests/reader3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the entities substitutions with the XmlTextReader interface # diff --git a/python/tests/reader4.py b/python/tests/reader4.py index 0bb3e3fa..f5fbaa1f 100755 --- a/python/tests/reader4.py +++ b/python/tests/reader4.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the basic APIs of the XmlTextReader interface # diff --git a/python/tests/reader5.py b/python/tests/reader5.py index da5355ff..f564e9b2 100755 --- a/python/tests/reader5.py +++ b/python/tests/reader5.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the Expand() API of the xmlTextReader interface # this extract the Dragon bibliography entries from the XML specification diff --git a/python/tests/reader6.py b/python/tests/reader6.py index ef33b184..0b2e68dd 100755 --- a/python/tests/reader6.py +++ b/python/tests/reader6.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the entities substitutions with the XmlTextReader interface # diff --git a/python/tests/reader7.py b/python/tests/reader7.py index c88e3702..2b1fb6d4 100755 --- a/python/tests/reader7.py +++ b/python/tests/reader7.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the entities substitutions with the XmlTextReader interface # diff --git a/python/tests/reader8.py b/python/tests/reader8.py index de2dcd6f..8636b8dd 100755 --- a/python/tests/reader8.py +++ b/python/tests/reader8.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the entities substitutions with the XmlTextReader interface # diff --git a/python/tests/readererr.py b/python/tests/readererr.py index c8ceba52..86baa3a5 100755 --- a/python/tests/readererr.py +++ b/python/tests/readererr.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the basic APIs of the XmlTextReader interface # diff --git a/python/tests/readernext.py b/python/tests/readernext.py index fcb9ae34..b77acbc8 100755 --- a/python/tests/readernext.py +++ b/python/tests/readernext.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # -*- coding: ISO-8859-1 -*- # # this tests the next API of the XmlTextReader interface diff --git a/python/tests/regexp.py b/python/tests/regexp.py index a03e4593..27901329 100755 --- a/python/tests/regexp.py +++ b/python/tests/regexp.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 # Memory debug specific diff --git a/python/tests/relaxng.py b/python/tests/relaxng.py index fa3d3273..a8a6a704 100755 --- a/python/tests/relaxng.py +++ b/python/tests/relaxng.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/resolver.py b/python/tests/resolver.py index 6f21f52e..f506a74c 100755 --- a/python/tests/resolver.py +++ b/python/tests/resolver.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 try: diff --git a/python/tests/schema.py b/python/tests/schema.py index 8089272c..7426c608 100755 --- a/python/tests/schema.py +++ b/python/tests/schema.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/serialize.py b/python/tests/serialize.py index 80b901ac..9f36a109 100755 --- a/python/tests/serialize.py +++ b/python/tests/serialize.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/sync.py b/python/tests/sync.py index 5a8609e9..b2a9131f 100755 --- a/python/tests/sync.py +++ b/python/tests/sync.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/thread2.py b/python/tests/thread2.py index 2749eb03..fd349517 100755 --- a/python/tests/thread2.py +++ b/python/tests/thread2.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import string, sys, time try: from _thread import get_ident diff --git a/python/tests/tst.py b/python/tests/tst.py index 57a7318a..51783366 100755 --- a/python/tests/tst.py +++ b/python/tests/tst.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py index 36ffe5f6..ffa3806d 100755 --- a/python/tests/tstLastError.py +++ b/python/tests/tstLastError.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys, unittest import libxml2 diff --git a/python/tests/tstURI.py b/python/tests/tstURI.py index e4d58af4..8c22ee7e 100755 --- a/python/tests/tstURI.py +++ b/python/tests/tstURI.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/tstmem.py b/python/tests/tstmem.py index 4e339912..858f2277 100755 --- a/python/tests/tstmem.py +++ b/python/tests/tstmem.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 try: diff --git a/python/tests/tstxpath.py b/python/tests/tstxpath.py index 0ba5a6d4..e8ba082d 100755 --- a/python/tests/tstxpath.py +++ b/python/tests/tstxpath.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/validDTD.py b/python/tests/validDTD.py index 4b03b8e2..17c7b3d4 100755 --- a/python/tests/validDTD.py +++ b/python/tests/validDTD.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/validRNG.py b/python/tests/validRNG.py index 57f13a45..22ebe318 100755 --- a/python/tests/validRNG.py +++ b/python/tests/validRNG.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/validSchemas.py b/python/tests/validSchemas.py index cc543f39..b123e01e 100755 --- a/python/tests/validSchemas.py +++ b/python/tests/validSchemas.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import libxml2 import sys diff --git a/python/tests/validate.py b/python/tests/validate.py index cec9cb0f..08c30ff9 100755 --- a/python/tests/validate.py +++ b/python/tests/validate.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/walker.py b/python/tests/walker.py index 47f0557c..00bb4c96 100755 --- a/python/tests/walker.py +++ b/python/tests/walker.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this tests the entities substitutions with the XmlTextReader interface # diff --git a/python/tests/xpath.py b/python/tests/xpath.py index 72e6c9db..de9c2fd7 100755 --- a/python/tests/xpath.py +++ b/python/tests/xpath.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # # this test exercise the XPath basic engine, parser, etc, and # allows to detect memory leaks diff --git a/python/tests/xpathext.py b/python/tests/xpathext.py index b83d2833..ab7b3bb3 100755 --- a/python/tests/xpathext.py +++ b/python/tests/xpathext.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/python/tests/xpathleak.py b/python/tests/xpathleak.py index 6940b790..0445fce0 100755 --- a/python/tests/xpathleak.py +++ b/python/tests/xpathleak.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import sys, libxml2 libxml2.debugMemory(True) diff --git a/python/tests/xpathns.py b/python/tests/xpathns.py index 379535e5..3aae6c7b 100755 --- a/python/tests/xpathns.py +++ b/python/tests/xpathns.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python # import libxml2 diff --git a/python/tests/xpathret.py b/python/tests/xpathret.py index 11c8b324..254bd946 100755 --- a/python/tests/xpathret.py +++ b/python/tests/xpathret.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys import libxml2 diff --git a/xstc/fixup-tests.py b/xstc/fixup-tests.py index 6e33d1c4..921820b3 100755 --- a/xstc/fixup-tests.py +++ b/xstc/fixup-tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python -u +#!/usr/bin/env python import sys, os import libxml2 diff --git a/xstc/xstc-to-python.xsl b/xstc/xstc-to-python.xsl index 78d55cd6..37de882c 100755 --- a/xstc/xstc-to-python.xsl +++ b/xstc/xstc-to-python.xsl @@ -7,7 +7,7 @@ - #!/usr/bin/python -u + #!/usr/bin/env python # -*- coding: UTF-8 -*- # # This file is generated from the W3C test suite description file.