From 1bab3b4cdeab387a57230065eeb0a6b91cd8fc46 2009-09-12 17:45:35 From: Brian Granger Date: 2009-09-12 17:45:35 Subject: [PATCH] Minor bug fixes and comments to address review. * Fixed main ipython script. * Fixed usage of USE_CURSES in completer.py * Added comment to gui-wx example. --- diff --git a/IPython/core/completer.py b/IPython/core/completer.py index a3585bd..44d2875 100644 --- a/IPython/core/completer.py +++ b/IPython/core/completer.py @@ -65,12 +65,12 @@ used, and this module (and the readline module) are silently inactive. import __builtin__ import __main__ import glob +import itertools import keyword import os import re import shlex import sys -import itertools import types from IPython.core.error import TryNext diff --git a/IPython/core/page.py b/IPython/core/page.py index 29f5bf2..7de15af 100644 --- a/IPython/core/page.py +++ b/IPython/core/page.py @@ -34,7 +34,7 @@ import sys from IPython.core import ipapi from IPython.core.error import TryNext from IPython.utils.genutils import ( - chop, Term + chop, Term, USE_CURSES ) if os.name == "nt": diff --git a/IPython/scripts/ipython b/IPython/scripts/ipython index a93e1de..f3860f1 100755 --- a/IPython/scripts/ipython +++ b/IPython/scripts/ipython @@ -23,6 +23,6 @@ this mode, there is no way to pass IPython any command-line options, as those are trapped first by Python itself. """ -import IPython.core.ipapi import launch_new_instance +from IPython.core.ipapi import launch_new_instance launch_new_instance() diff --git a/docs/examples/lib/gui-wx.py b/docs/examples/lib/gui-wx.py index 9a937e8..1ddaf55 100644 --- a/docs/examples/lib/gui-wx.py +++ b/docs/examples/lib/gui-wx.py @@ -11,6 +11,14 @@ Ref: Modified from wxPython source code wxPython/samples/simple/simple.py This example can only be run once in a given IPython session because when the frame is closed, wx goes through its shutdown sequence, killing further attempts. I am sure someone who knows wx can fix this issue. + +Furthermore, once this example is run, the Wx event loop is mostly dead, so +even other new uses of Wx may not work correctly. If you know how to better +handle this, please contact the ipython developers and let us know. + +Note however that we will work with the Matplotlib and Enthought developers so +that the main interactive uses of Wx we are aware of, namely these tools, will +continue to work well with IPython interactively. """ import wx