Merge in bpdb

ikanobori · ikanobori · commit 606d2efd12eb · 2010-06-21T21:11:55.000+02:00
diff --git a/bpdb/__init__.py b/bpdb/__init__.py
@@ -0,0 +1,36 @@
+# The MIT License
+#
+# Copyright (c) 2008 Bob Farrell
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+import sys
+
+import bpython
+from bpdb.debugger import BPdb
+
+
+__version__ = bpython.__version__
+
+
+def set_trace():
+    """ Just like pdb.set_trace(), a helper function that creates
+    a debugger instance and sets the trace. """
+    debugger = BPdb()
+    debugger.set_trace(sys._getframe().f_back)
diff --git a/bpdb/debugger.py b/bpdb/debugger.py
@@ -0,0 +1,52 @@
+# The MIT License
+#
+# Copyright (c) 2008 Bob Farrell
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+
+import pdb
+import bpython
+
+class BPdb(pdb.Pdb):
+    """ PDB with BPython support. """
+
+    def __init__(self):
+        pdb.Pdb.__init__(self)
+        self.rcLines = []
+        self.prompt = '(BPdb) '
+
+
+    ### cmd.Cmd commands
+
+
+    def do_Bpython(self, arg):
+        bpython.embed(self.curframe.f_locals, ['-i'])
+
+
+    def help_Bpython(self):
+        print "B(python)"
+        print
+        print ("Invoke the bpython interpreter for this stack frame. To exit "
+               "bpython and return to a standard pdb press Ctrl-d")
+
+
+    ### shortcuts
+    do_B = do_Bpython
+    help_B = help_Bpython
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1622,6 +1622,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     global repl
     DO_RESIZE = False
 
+    # FIXME: Handle window resize without signals
     old_sigwinch_handler = signal.signal(signal.SIGWINCH,
                                          lambda *_: sigwinch(scr))
     # redraw window after being suspended
@@ -1679,6 +1680,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     curses.raw(False)
 
     # Restore signal handlers
+    # FIXME: handle window resizes without signals
     signal.signal(signal.SIGWINCH, old_sigwinch_handler)
     signal.signal(signal.SIGCONT, old_sigcont_handler)
 
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -209,7 +209,12 @@ def getpydocspec(f, func):
 
 
 def getargspec(func, f):
-    is_bound_method = inspect.ismethod(f) and f.im_self is not None
+    # Check if it's a real bound method or if it's implicitly calling __init__
+    # (i.e. FooClass(...) and not FooClass.__init__(...) -- the former would
+    # not take 'self', the latter would:
+    is_bound_method = ((inspect.ismethod(f) and f.im_self is not None)
+                    or (f.__name__ == '__init__' and not
+                        func.endswith('.__init__')))
     try:
         if py3:
             argspec = inspect.getfullargspec(f)
