From ce61b4c436f6f03dac5b1a6f107aaf7315e78e38 2011-06-30 17:16:44 From: MinRK Date: 2011-06-30 17:16:44 Subject: [PATCH] fix docs&examples pointing to appstart_ methods renamed to enable_ --- diff --git a/docs/examples/lib/gui-gtk.py b/docs/examples/lib/gui-gtk.py index 6b45ef1..e999d9f 100755 --- a/docs/examples/lib/gui-gtk.py +++ b/docs/examples/lib/gui-gtk.py @@ -34,8 +34,8 @@ button.show() window.show() try: - from IPython.lib.inputhook import appstart_gtk - appstart_gtk() + from IPython.lib.inputhook import enable_gtk + enable_gtk() except ImportError: gtk.main() diff --git a/docs/examples/lib/gui-qt.py b/docs/examples/lib/gui-qt.py index 4a0b935..efe2d31 100755 --- a/docs/examples/lib/gui-qt.py +++ b/docs/examples/lib/gui-qt.py @@ -35,6 +35,6 @@ if __name__ == '__main__': sw.show() try: - from IPython import appstart_qt4; appstart_qt4(app) + from IPython import enable_qt4; enable_qt4(app) except ImportError: app.exec_() diff --git a/docs/examples/lib/gui-tk.py b/docs/examples/lib/gui-tk.py index f7366aa..3ea6141 100644 --- a/docs/examples/lib/gui-tk.py +++ b/docs/examples/lib/gui-tk.py @@ -27,6 +27,6 @@ root = Tk() app = MyApp(root) try: - from IPython import appstart_tk; appstart_tk(root) + from IPython import enable_tk; enable_tk(root) except ImportError: root.mainloop() diff --git a/docs/examples/lib/gui-wx.py b/docs/examples/lib/gui-wx.py index 1ddaf55..14346a7 100644 --- a/docs/examples/lib/gui-wx.py +++ b/docs/examples/lib/gui-wx.py @@ -102,8 +102,8 @@ if app is None: app = MyApp(redirect=False, clearSigInt=False) try: - from IPython.lib.inputhook import appstart_wx - appstart_wx(app) + from IPython.lib.inputhook import enable_wx + enable_wx(app) except ImportError: app.MainLoop() diff --git a/docs/source/interactive/reference.txt b/docs/source/interactive/reference.txt index 14bece3..f15b0a0 100644 --- a/docs/source/interactive/reference.txt +++ b/docs/source/interactive/reference.txt @@ -1238,13 +1238,13 @@ Second, when using the ``PyOSInputHook`` approach, a GUI application should ``PyOSInputHook``. This means that applications that are meant to be used both in IPython and as standalone apps need to have special code to detects how the application is being run. We highly recommend using IPython's -:func:`appstart_` functions for this. Here is a simple example that shows the +:func:`enable_foo` functions for this. Here is a simple example that shows the recommended code that should be at the bottom of a wxPython using GUI application:: try: - from IPython import appstart_wx - appstart_wx(app) + from IPython.lib.inputhook import enable_wx + enable_wx(app) except ImportError: app.MainLoop()