##// END OF EJS Templates
rocky's pydb patch \#4
vivainio -
r475:aa93c3d3
parent child
Show More
@@ -15,7 +15,7 details on the PSF (Python Software Foundation) standard license, see:
15
15
16 http://www.python.org/2.2.3/license.html
16 http://www.python.org/2.2.3/license.html
17
17
18 $Id: Debugger.py 1955 2006-11-29 09:44:32Z vivainio $"""
18 $Id: Debugger.py 1961 2006-12-05 21:02:40Z vivainio $"""
19
19
20 #*****************************************************************************
20 #*****************************************************************************
21 #
21 #
@@ -97,11 +97,14 class Pdb(OldPdb):
97 stdin=None, stdout=None):
97 stdin=None, stdout=None):
98
98
99 # Parent constructor:
99 # Parent constructor:
100 OldPdb.__init__(self,completekey,stdin,stdout)
100 if has_pydb and completekey is None:
101 OldPdb.__init__(self,stdin=stdin,stdout=stdout)
102 else:
103 OldPdb.__init__(self,completekey,stdin,stdout)
104 self.prompt = prompt # The default prompt is '(Pdb)'
101
105
102 # IPython changes...
106 # IPython changes...
103 self.prompt = prompt # The default prompt is '(Pdb)'
107 self.is_pydb = has_pydb
104 self.is_pydb = prompt == 'ipydb>'
105
108
106 if self.is_pydb:
109 if self.is_pydb:
107
110
@@ -117,7 +120,6 class Pdb(OldPdb):
117 self.old_all_completions = __IPYTHON__.Completer.all_completions
120 self.old_all_completions = __IPYTHON__.Completer.all_completions
118 __IPYTHON__.Completer.all_completions=self.all_completions
121 __IPYTHON__.Completer.all_completions=self.all_completions
119
122
120 # Do we have access to pydb's list command parser?
121 self.do_list = decorate_fn_with_doc(self.list_command_pydb,
123 self.do_list = decorate_fn_with_doc(self.list_command_pydb,
122 OldPdb.do_list)
124 OldPdb.do_list)
123 self.do_l = self.do_list
125 self.do_l = self.do_list
@@ -1,7 +1,7
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Magic functions for InteractiveShell.
2 """Magic functions for InteractiveShell.
3
3
4 $Id: Magic.py 1956 2006-11-30 05:22:31Z fperez $"""
4 $Id: Magic.py 1961 2006-12-05 21:02:40Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
7 # Copyright (C) 2001 Janko Hauser <jhauser@zscout.de> and
@@ -693,7 +693,6 Currently the magic system has the following functions:\n"""
693 """Print the definition header for any callable object.
693 """Print the definition header for any callable object.
694
694
695 If the object is a class, print the constructor information."""
695 If the object is a class, print the constructor information."""
696 print "+++"
697 self._inspect('pdef',parameter_s, namespaces)
696 self._inspect('pdef',parameter_s, namespaces)
698
697
699 def magic_pdoc(self, parameter_s='', namespaces=None):
698 def magic_pdoc(self, parameter_s='', namespaces=None):
@@ -1,7 +1,7
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 """Release data for the IPython project.
2 """Release data for the IPython project.
3
3
4 $Id: Release.py 1955 2006-11-29 09:44:32Z vivainio $"""
4 $Id: Release.py 1961 2006-12-05 21:02:40Z vivainio $"""
5
5
6 #*****************************************************************************
6 #*****************************************************************************
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
7 # Copyright (C) 2001-2006 Fernando Perez <fperez@colorado.edu>
@@ -22,7 +22,7 name = 'ipython'
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
22 # because bdist_rpm does not accept dashes (an RPM) convention, and
23 # bdist_deb does not accept underscores (a Debian convention).
23 # bdist_deb does not accept underscores (a Debian convention).
24
24
25 revision = '1954'
25 revision = '1955'
26
26
27 #version = '0.7.3.svn'
27 #version = '0.7.3.svn'
28
28
@@ -6,7 +6,7 Requires Python 2.3 or newer.
6
6
7 This file contains all the classes and helper functions specific to IPython.
7 This file contains all the classes and helper functions specific to IPython.
8
8
9 $Id: iplib.py 1956 2006-11-30 05:22:31Z fperez $
9 $Id: iplib.py 1961 2006-12-05 21:02:40Z vivainio $
10 """
10 """
11
11
12 #*****************************************************************************
12 #*****************************************************************************
@@ -1427,13 +1427,12 want to merge them back into the new files.""" % locals()
1427 return
1427 return
1428
1428
1429 have_pydb = False
1429 have_pydb = False
1430 if sys.version[:3] >= '2.5':
1430 # use pydb if available
1431 # use pydb if available
1431 try:
1432 try:
1432 from pydb import pm
1433 from pydb import pm
1433 have_pydb = True
1434 have_pydb = True
1434 except ImportError:
1435 except ImportError:
1435 pass
1436 pass
1437 if not have_pydb:
1436 if not have_pydb:
1438 # fallback to our internal debugger
1437 # fallback to our internal debugger
1439 pm = lambda : self.InteractiveTB.debugger(force=True)
1438 pm = lambda : self.InteractiveTB.debugger(force=True)
@@ -1,3 +1,8
1 2006-12-5 Ville Vainio <vivainio@gmail.com>
2
3 * Magic.py, iplib.py, completer.py: Apply R. Bernstein's
4 pydb patch 4 (rm debug printing, py 2.5 checking)
5
1 2006-11-30 Walter Doerwald <walter@livinglogic.de>
6 2006-11-30 Walter Doerwald <walter@livinglogic.de>
2 * IPython/Extensions/ibrowse.py: Add two new commands to ibrowse:
7 * IPython/Extensions/ibrowse.py: Add two new commands to ibrowse:
3 "refresh" (mapped to "r") refreshes the screen by restarting the iterator.
8 "refresh" (mapped to "r") refreshes the screen by restarting the iterator.
General Comments 0
You need to be logged in to leave comments. Login now