espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-12-18 00:37:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

[gdb/python] Handle empty PYTHONDONTWRITEBYTECODE

Browse Source 
When using PYTHONDONTWRITEBYTECODE with an empty string we get:
...
$ PYTHONDONTWRITEBYTECODE= gdb -q -batch -ex "show python dont-write-bytecode"
Python's dont-write-bytecode setting is auto (currently on).
...

This is incorrect, it should be off.

The actual setting is correct, that was already fixed in commit 24d2cbc42c
("set/show python dont-write-bytecode fixes"), in function
python_write_bytecode.

Fix this by:
- factoring out new function env_python_dont_write_bytecode out of
  python_write_bytecode, and
- using it in show_python_dont_write_bytecode.

Tested on x86_64-linux, using test-case gdb.python/py-startup-opt.exp and:
- PYTHONDONTWRITEBYTECODE=
- PYTHONDONTWRITEBYTECODE=1
- unset PYTHONDONTWRITEBYTECODE

Approved-By: Tom Tromey <tom@tromey.com>

PR python/32389
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32389
This commit is contained in:
Tom de Vries
2024-12-03 22:54:23 +01:00
parent 1dc13c7e9f
commit 922ab963e1
2 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
gdb/python/python.c
View File

@@ -2141,6 +2141,17 @@ set_python_ignore_environment (const char *args, int from_tty,
not write `.pyc' files on import of a module. */
static enum auto_boolean python_dont_write_bytecode = AUTO_BOOLEAN_AUTO;
/* Return true if environment variable PYTHONDONTWRITEBYTECODE is set to a
non-empty string. */
static bool
env_python_dont_write_bytecode ()
{
const char *envvar = getenv ("PYTHONDONTWRITEBYTECODE");
return envvar != nullptr && envvar[0] != '\0';
}
/* Implement 'show python dont-write-bytecode'. */
static void
@@ -2150,8 +2161,10 @@ show_python_dont_write_bytecode (struct ui_file *file, int from_tty,
if (python_dont_write_bytecode == AUTO_BOOLEAN_AUTO)
{
const char *auto_string
= (python_ignore_environment
|| getenv ("PYTHONDONTWRITEBYTECODE") == nullptr) ? "off" : "on";
= ((python_ignore_environment
|| !env_python_dont_write_bytecode ())
? "off"
: "on");
gdb_printf (file,
_("Python's dont-write-bytecode setting is %s (currently %s).\n"),
@@ -2177,10 +2190,7 @@ python_write_bytecode ()
if (python_ignore_environment)
wbc = 1;
else
{
const char *pdwbc = getenv ("PYTHONDONTWRITEBYTECODE");
wbc = (pdwbc == nullptr || pdwbc[0] == '\0') ? 1 : 0;
}
wbc = env_python_dont_write_bytecode () ? 0 : 1;
}
else
wbc = python_dont_write_bytecode == AUTO_BOOLEAN_TRUE ? 0 : 1;