Issue #10405: merge from 3.2

This commit is contained in:
Ned Deily 2012-10-20 13:27:32 -07:00
commit d2cc1bb057
2 changed files with 51 additions and 13 deletions

View File

@ -154,27 +154,56 @@ The rest of this menu lists the names of all open windows; select one to bring
it to the foreground (deiconifying it if necessary).
Debug menu (in the Python Shell window only)
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Debug menu
^^^^^^^^^^
* in the Python Shell window only
Go to file/line
look around the insert point for a filename and linenumber, open the file, and
show the line.
Look around the insert point for a filename and line number, open the file,
and show the line. Useful to view the source lines referenced in an
exception traceback.
Open stack viewer
show the stack traceback of the last exception
Debugger
Run commands in the shell under the debugger.
Debugger toggle
Run commands in the shell under the debugger
Stack viewer
Show the stack traceback of the last exception.
JIT Stack viewer toggle
Open stack viewer on traceback
Auto-open Stack Viewer
Open stack viewer on traceback.
.. index::
single: stack viewer
single: debugger
Edit context menu
^^^^^^^^^^^^^^^^^
* Right-click in Edit window (Control-click on OS X)
Set Breakpoint
Sets a breakpoint. Breakpoints are only enabled when the debugger is open.
Clear Breakpoint
Clears the breakpoint on that line.
.. index::
single: Set Breakpoint
single: Clear Breakpoint
single: breakpoints
Shell context menu
^^^^^^^^^^^^^^^^^^
* Right-click in Python Shell window (Control-click on OS X)
Go to file/line
Same as in Debug menu.
Basic editing and navigation
----------------------------

View File

@ -92,7 +92,7 @@ Options Menu:
Startup Preferences may be set, and Additional Help
Sources can be specified.
On MacOS X this menu is not present, use
On OS X this menu is not present, use
menu 'IDLE -> Preferences...' instead.
---
Code Context -- Open a pane at the top of the edit window which
@ -120,6 +120,15 @@ Help Menu:
---
(Additional Help Sources may be added here)
Edit context menu (Right-click / Control-click in Edit window):
Set Breakpoint -- Sets a breakpoint (when debugger open)
Clear Breakpoint -- Clears the breakpoint on that line
Shell context menu (Right-click / Control-click in Shell window):
Go to file/line -- Same as in Debug menu
** TIPS **
==========
@ -222,7 +231,7 @@ Python Shell window:
Alt-p retrieves previous command matching what you have typed.
Alt-n retrieves next.
(These are Control-p, Control-n on the Mac)
(These are Control-p, Control-n on OS X)
Return while cursor is on a previous command retrieves that command.
Expand word is also useful to reduce typing.