GDB Refactor [19/N]: Move gdbutils/functions.py to gdblib (#1253)

pwndbg/__init__.py

@@ -18,7 +18,6 @@ import pwndbg.disasm.sparc
 import pwndbg.disasm.x86
 import pwndbg.elf
 import pwndbg.exception
-import pwndbg.gdbutils.functions
 import pwndbg.heap
 import pwndbg.lib.version
 import pwndbg.ui

pwndbg/commands/ida.py

@@ -9,7 +9,7 @@ import pwndbg.commands
 import pwndbg.commands.context
 import pwndbg.gdblib.regs
 import pwndbg.ida
-from pwndbg.gdbutils.functions import GdbFunction
+from pwndbg.gdblib.functions import GdbFunction
 
 
 @pwndbg.commands.ArgparsedCommand("Synchronize IDA's cursor with GDB")

pwndbg/gdblib/__init__.py

@@ -17,6 +17,7 @@ def load_gdblib():
     import pwndbg.gdblib.argv
     import pwndbg.gdblib.ctypes
     import pwndbg.gdblib.events
+    import pwndbg.gdblib.functions
     import pwndbg.gdblib.hooks
     import pwndbg.gdblib.memory
     import pwndbg.gdblib.prompt

pwndbg/gdblib/prompt.py

@@ -4,15 +4,13 @@ import gdb
 
 import pwndbg.decorators
 import pwndbg.gdblib.events
-import pwndbg.gdbutils
+import pwndbg.gdblib.functions
 import pwndbg.lib.memoize
 from pwndbg.color import disable_colors
 from pwndbg.color import message
 from pwndbg.lib.tips import get_tip_of_the_day
 
-funcs_list_str = ", ".join(
-    message.notice("$" + f.name) for f in pwndbg.gdbutils.functions.functions
-)
+funcs_list_str = ", ".join(message.notice("$" + f.name) for f in pwndbg.gdblib.functions.functions)
 
 num_pwndbg_cmds = sum(1 for _ in filter(lambda c: not c.shell, pwndbg.commands.commands))
 num_shell_cmds = sum(1 for _ in filter(lambda c: c.shell, pwndbg.commands.commands))

pwndbg/gdbutils/__init__.py

@@ -1,3 +0,0 @@
-"""
-Put all new things related to gdb in this module.
-"""