aboutsummaryrefslogtreecommitdiff
path: root/gdb/python
diff options
context:
space:
mode:
authorChristian Biesinger <cbiesinger@google.com>2019-08-15 11:29:04 -0500
committerChristian Biesinger <cbiesinger@google.com>2019-08-15 14:21:57 -0500
commit08235187bcdd66599884f33b046cf8abcf949727 (patch)
tree25b24ee7c7e7f2faafd82583addf7b4dac38cc57 /gdb/python
parent080a488354d63fec9791a26fadd15e0c5246983d (diff)
downloadgdb-08235187bcdd66599884f33b046cf8abcf949727.zip
gdb-08235187bcdd66599884f33b046cf8abcf949727.tar.gz
gdb-08235187bcdd66599884f33b046cf8abcf949727.tar.bz2
Rename internal Python functions to start with an underscore
I could not tell if GdbSetPythonDirectory is internal or not because I could not find any references to it, so I left it as-is. Tested by running the testsuite on gdb.python/*.exp; everything still passes. 2019-08-15 Christian Biesinger <cbiesinger@google.com> * python/lib/gdb/__init__.py (GdbOutputFile): Rename to have a leading underscore. (GdbOutputErrorFile): Likewise. (global scope): Adjust constructor calls to GdbOutput{,Error}File accordingly. (execute_unwinders): Rename to have a leading underscore. (auto_load_packages): Likewise. (global scope): Adjust call to auto_load_packages accordingly. (GdbSetPythonDirectory): Likewise. * python/py-unwind.c (pyuw_sniffer): Call _execute_unwinders instead of execute_unwinders. gdb/testsuite/ChangeLog: 2019-08-15 Christian Biesinger <cbiesinger@google.com> * gdb.python/python.exp: Expect a leading underscore on GdbOutput{,Error}File.
Diffstat (limited to 'gdb/python')
-rw-r--r--gdb/python/lib/gdb/__init__.py16
-rw-r--r--gdb/python/py-unwind.c6
2 files changed, 11 insertions, 11 deletions
diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py
index af74df8..8af9e47 100644
--- a/gdb/python/lib/gdb/__init__.py
+++ b/gdb/python/lib/gdb/__init__.py
@@ -43,17 +43,17 @@ class _GdbFile (object):
def flush(self):
flush()
-class GdbOutputFile (_GdbFile):
+class _GdbOutputFile (_GdbFile):
def write(self, s):
write(s, stream=STDOUT)
-sys.stdout = GdbOutputFile()
+sys.stdout = _GdbOutputFile()
-class GdbOutputErrorFile (_GdbFile):
+class _GdbOutputErrorFile (_GdbFile):
def write(self, s):
write(s, stream=STDERR)
-sys.stderr = GdbOutputErrorFile()
+sys.stderr = _GdbOutputErrorFile()
# Default prompt hook does nothing.
prompt_hook = None
@@ -74,7 +74,7 @@ frame_filters = {}
# Initial frame unwinders.
frame_unwinders = []
-def execute_unwinders(pending_frame):
+def _execute_unwinders(pending_frame):
"""Internal function called from GDB to execute all unwinders.
Runs each currently enabled unwinder until it finds the one that
@@ -124,7 +124,7 @@ packages = [
# manually iterate the list, collating the Python files in each module
# path. Construct the module name, and import.
-def auto_load_packages():
+def _auto_load_packages():
for package in packages:
location = os.path.join(os.path.dirname(__file__), package)
if os.path.exists(location):
@@ -144,7 +144,7 @@ def auto_load_packages():
except:
sys.stderr.write (traceback.format_exc() + "\n")
-auto_load_packages()
+_auto_load_packages()
def GdbSetPythonDirectory(dir):
"""Update sys.path, reload gdb and auto-load packages."""
@@ -161,7 +161,7 @@ def GdbSetPythonDirectory(dir):
# note that reload overwrites the gdb module without deleting existing
# attributes
reload(__import__(__name__))
- auto_load_packages()
+ _auto_load_packages()
def current_progspace():
"Return the current Progspace."
diff --git a/gdb/python/py-unwind.c b/gdb/python/py-unwind.c
index 08c3aff..7cb9fa1 100644
--- a/gdb/python/py-unwind.c
+++ b/gdb/python/py-unwind.c
@@ -507,16 +507,16 @@ pyuw_sniffer (const struct frame_unwind *self, struct frame_info *this_frame,
/* Run unwinders. */
if (gdb_python_module == NULL
- || ! PyObject_HasAttrString (gdb_python_module, "execute_unwinders"))
+ || ! PyObject_HasAttrString (gdb_python_module, "_execute_unwinders"))
{
PyErr_SetString (PyExc_NameError,
- "Installation error: gdb.execute_unwinders function "
+ "Installation error: gdb._execute_unwinders function "
"is missing");
gdbpy_print_stack ();
return 0;
}
gdbpy_ref<> pyo_execute (PyObject_GetAttrString (gdb_python_module,
- "execute_unwinders"));
+ "_execute_unwinders"));
if (pyo_execute == NULL)
{
gdbpy_print_stack ();