Merge upstream

IPython/Release.py

@@ -22,7 +22,7 b" 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':

IPython/UserConfig/ipy_user_conf.py

@@ -85,7 +85,7 b' def main():'
     #import ipy_winpdb
     
     # For bzr completer, requires bzrlib (the python installation of bzr)
-    #import ipy_bzr
+    #ip.load('ipy_bzr')
     
     
     

IPython/deep_reload.py

@@ -32,7 +32,9 b' 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)

doc/ChangeLog

@@ -1,3 +1,8 b''
[phone]  Ville Vainio <[e-mail]>
+
+	* deep_reload.py: do not crash on from __future__ import 
+	absolute_import. Close #244.
+
 2008-04-02  Ville Vainio <[e-mail]>
 
 	* ipy_winpdb.py: New extension for winpdb integration.  %wdb