diff options
author | Gerald Combs <gerald@wireshark.org> | 2020-11-03 19:22:14 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2020-11-09 17:11:54 +0000 |
commit | 263d7a5272de5da0cad8c3518bbe1080d7609b3a (patch) | |
tree | e2ef3f2c28dc1234cec5de5a7c5424850490587e /tools/make-plugin-reg.py | |
parent | 6891c21fe1e6830aaf9fb969b4d3564113f53b35 (diff) |
Tools+test: Call python3 explicitly.
PEP 394[1] says,
"In cases where the script is expected to be executed outside virtual
environments, developers will need to be aware of the following
discrepancies across platforms and installation methods:
* Older Linux distributions will provide a python command that refers
to Python 2, and will likely not provide a python2 command.
* Some newer Linux distributions will provide a python command that
refers to Python 3.
* Some Linux distributions will not provide a python command at all by
default, but will provide a python3 command by default."
Debian has forced the issue by choosing the third option[2]:
"NOTE: Debian testing (bullseye) has removed the "python" package and
the '/usr/bin/python' symlink due to the deprecation of Python 2."
Switch our shebang from "#!/usr/bin/env python" to "#!/usr/bin/env
python3" in some places. Remove some 2/3 version checks if we know we're
running under Python 3. Remove the "coding: utf-8" in a bunch of places
since that's the default in Python 3.
[1]https://www.python.org/dev/peps/pep-0394/#for-python-script-publishers
[2]https://wiki.debian.org/Python
(cherry picked from commit 30c392f166475a251ea8c3cfde305b40971bbbef)
Diffstat (limited to 'tools/make-plugin-reg.py')
-rwxr-xr-x | tools/make-plugin-reg.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/make-plugin-reg.py b/tools/make-plugin-reg.py index 9e4819a683..946edb8d3b 100755 --- a/tools/make-plugin-reg.py +++ b/tools/make-plugin-reg.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # # Looks for registration routines in the plugins # and assembles C code to call all the routines. |