fixed rlineimpl to work properly with py2exed pyreadline

IPython/rlineimpl.py

@@ -1,40 +1,43 b''
 # -*- coding: utf-8 -*-
 """ Imports and provides the 'correct' version of readline for the platform.
 
 Readline is used throughout IPython as 'import IPython.rlineimpl as readline'.
 
 In addition to normal readline stuff, this module provides have_readline
 boolean and _outputfile variable used in genutils.
 
 $Id: Magic.py 1096 2006-01-28 20:08:02Z vivainio $"""
 
 import sys
 
 try:
     from readline import *
     import readline as _rl
     have_readline = True
 except ImportError:
-    have_readline = False
+    try:
+        from pyreadline import *
+        import pyreadline as _rl
+        have_readline = True
+    except ImportError:    
+        have_readline = False
 
 if sys.platform == 'win32' and have_readline:
     try:
         _outputfile=_rl.GetOutputFile()
-    except NameError:
+    except AttributeError:
         print "Failed GetOutputFile"
         have_readline = False
     
 # the clear_history() function was only introduced in Python 2.4 and is
 # actually optional in the readline API, so we must explicitly check for its
 # existence.  Some known platforms actually don't have it.  This thread:
 # http://mail.python.org/pipermail/python-dev/2003-August/037845.html
 # has the original discussion.
 
 if have_readline:
-    import readline
     try:
-        readline.clear_history
+        _rl.clear_history
     except AttributeError:
         def clear_history(): pass
-        readline.clear_history = clear_history
-    del readline
+        _rl.clear_history = clear_history
  No newline at end of file