diff --git a/IPython/Debugger.py b/IPython/Debugger.py index 36ef39a..12d4613 100644 --- a/IPython/Debugger.py +++ b/IPython/Debugger.py @@ -15,7 +15,7 @@ details on the PSF (Python Software Foundation) standard license, see: http://www.python.org/2.2.3/license.html -$Id: Debugger.py 1951 2006-11-29 07:56:47Z vivainio $""" +$Id: Debugger.py 1954 2006-11-29 09:39:44Z vivainio $""" #***************************************************************************** # @@ -49,13 +49,12 @@ from IPython.excolors import ExceptionColors # See if we can use pydb. has_pydb = False prompt = 'ipdb>' -if sys.version[:3] >= '2.5': - try: - import pydb - if hasattr(pydb.pydb, "runl"): - has_pydb = True - from pydb import Pdb as OldPdb - prompt = 'ipydb>' +try: + import pydb + if hasattr(pydb.pydb, "runl"): + has_pydb = True + from pydb import Pdb as OldPdb + prompt = 'ipydb>' except ImportError: pass @@ -93,7 +92,7 @@ def _file_lines(fname): class Pdb(OldPdb): """Modified Pdb class, does not load readline.""" - if sys.version[:3] >= '2.5': + if sys.version[:3] >= '2.5' or has_pydb: def __init__(self,color_scheme='NoColor',completekey=None, stdin=None, stdout=None): diff --git a/IPython/Release.py b/IPython/Release.py index 7dd13e1..e5d5a7e 100644 --- a/IPython/Release.py +++ b/IPython/Release.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Release data for the IPython project. -$Id: Release.py 1953 2006-11-29 08:01:37Z vivainio $""" +$Id: Release.py 1954 2006-11-29 09:39:44Z vivainio $""" #***************************************************************************** # Copyright (C) 2001-2006 Fernando Perez @@ -22,7 +22,7 @@ name = 'ipython' # because bdist_rpm does not accept dashes (an RPM) convention, and # bdist_deb does not accept underscores (a Debian convention). -revision = '1952M' +revision = '1953' #version = '0.7.3.svn'