diff --git a/IPython/Release.py b/IPython/Release.py index 50094ad..b06094b 100644 --- a/IPython/Release.py +++ b/IPython/Release.py @@ -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 = '57' +revision = '96' branch = 'ipython' if branch == 'ipython': diff --git a/IPython/UserConfig/ipy_user_conf.py b/IPython/UserConfig/ipy_user_conf.py index e77abcc..55049ba 100644 --- a/IPython/UserConfig/ipy_user_conf.py +++ b/IPython/UserConfig/ipy_user_conf.py @@ -85,7 +85,7 @@ def main(): #import ipy_winpdb # For bzr completer, requires bzrlib (the python installation of bzr) - #import ipy_bzr + #ip.load('ipy_bzr') diff --git a/IPython/deep_reload.py b/IPython/deep_reload.py index f8da73c..a0a6236 100644 --- a/IPython/deep_reload.py +++ b/IPython/deep_reload.py @@ -32,7 +32,9 @@ import imp import sys # Replacement for __import__() -def deep_import_hook(name, globals=None, locals=None, fromlist=None): +def deep_import_hook(name, globals=None, locals=None, fromlist=None, level=-1): + # For now level is ignored, it's just there to prevent crash + # with from __future__ import absolute_import parent = determine_parent(globals) q, tail = find_head_package(parent, name) m = load_tail(q, tail) diff --git a/doc/ChangeLog b/doc/ChangeLog index 33d2503..f5b621f 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,3 +1,8 @@ +2008-04-09 Ville Vainio + + * deep_reload.py: do not crash on from __future__ import + absolute_import. Close #244. + 2008-04-02 Ville Vainio * ipy_winpdb.py: New extension for winpdb integration. %wdb