#16887: merge with 3.3.

15 files changed, 356 insertions, 286 deletions

diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py
index 810f588558..148a1daaa0 100644
--- a/Lib/idlelib/EditorWindow.py
+++ b/Lib/idlelib/EditorWindow.py
@@ -542,7 +542,7 @@ class EditorWindow(object):
         if sys.platform[:3] == 'win':
             try:
                 os.startfile(self.help_url)
-            except WindowsError as why:
+            except OSError as why:
                 tkMessageBox.showerror(title='Document Start Failure',
                     message=str(why), parent=self.text)
         else:
@@ -852,7 +852,7 @@ class EditorWindow(object):
             if sys.platform[:3] == 'win':
                 try:
                     os.startfile(helpfile)
-                except WindowsError as why:
+                except OSError as why:
                     tkMessageBox.showerror(title='Document Start Failure',
                         message=str(why), parent=self.text)
             else:
@@ -886,7 +886,7 @@ class EditorWindow(object):
             with open(self.recent_files_path, 'w',
                         encoding='utf_8', errors='replace') as rf_file:
                 rf_file.writelines(rf_list)
-        except IOError as err:
+        except OSError as err:
             if not getattr(self.root, "recentfilelist_error_displayed", False):
                 self.root.recentfilelist_error_displayed = True
                 tkMessageBox.showerror(title='IDLE Error',
diff --git a/Lib/idlelib/FileList.py b/Lib/idlelib/FileList.py
index 37a337ed9a..a9989a8624 100644
--- a/Lib/idlelib/FileList.py
+++ b/Lib/idlelib/FileList.py
@@ -103,7 +103,7 @@ class FileList:
         if not os.path.isabs(filename):
             try:
                 pwd = os.getcwd()
-            except os.error:
+            except OSError:
                 pass
             else:
                 filename = os.path.join(pwd, filename)
diff --git a/Lib/idlelib/GrepDialog.py b/Lib/idlelib/GrepDialog.py
index 27fcc33c32..1d8d51b593 100644
--- a/Lib/idlelib/GrepDialog.py
+++ b/Lib/idlelib/GrepDialog.py
@@ -82,7 +82,7 @@ class GrepDialog(SearchDialogBase):
         for fn in list:
             try:
                 f = open(fn, errors='replace')
-            except IOError as msg:
+            except OSError as msg:
                 print(msg)
                 continue
             lineno = 0
@@ -110,7 +110,7 @@ class GrepDialog(SearchDialogBase):
     def findfiles(self, dir, base, rec):
         try:
             names = os.listdir(dir or os.curdir)
-        except os.error as msg:
+        except OSError as msg:
             print(msg)
             return []
         list = []
diff --git a/Lib/idlelib/IOBinding.py b/Lib/idlelib/IOBinding.py
index 9fe0701133..dda3634315 100644
--- a/Lib/idlelib/IOBinding.py
+++ b/Lib/idlelib/IOBinding.py
@@ -213,7 +213,7 @@ class IOBinding:
             f.seek(0)
             bytes = f.read()
             f.close()
-        except IOError as msg:
+        except OSError as msg:
             tkMessageBox.showerror("I/O Error", str(msg), master=self.text)
             return False
         chars, converted = self._decode(two_lines, bytes)
@@ -378,7 +378,7 @@ class IOBinding:
             f.flush()
             f.close()
             return True
-        except IOError as msg:
+        except OSError as msg:
             tkMessageBox.showerror("I/O Error", str(msg),
                                    master=self.text)
             return False
@@ -504,7 +504,7 @@ class IOBinding:
         else:
             try:
                 pwd = os.getcwd()
-            except os.error:
+            except OSError:
                 pwd = ""
             return pwd, ""
 
diff --git a/Lib/idlelib/NEWS.txt b/Lib/idlelib/NEWS.txt
index 54507015a1..478c18337e 100644
--- a/Lib/idlelib/NEWS.txt
+++ b/Lib/idlelib/NEWS.txt
@@ -1,12 +1,10 @@
-What's New in IDLE 3.3.2?
+What's New in IDLE 3.4.0?
 =========================
 
 - Issue #17390: Display Python version on Idle title bar.
   Initial patch by Edmond Burnett.
 
-
-What's New in IDLE 3.3.1?
-=========================
+- Issue #5066: Update IDLE docs. Patch by Todd Rovito.
 
 - Issue #17625: Close the replace dialog after it is used.
 
diff --git a/Lib/idlelib/OutputWindow.py b/Lib/idlelib/OutputWindow.py
index 745ccd2613..9dacc492b5 100644
--- a/Lib/idlelib/OutputWindow.py
+++ b/Lib/idlelib/OutputWindow.py
@@ -106,7 +106,7 @@ class OutputWindow(EditorWindow):
                     f = open(filename, "r")
                     f.close()
                     break
-                except IOError:
+                except OSError:
                     continue
         else:
             return None
diff --git a/Lib/idlelib/PathBrowser.py b/Lib/idlelib/PathBrowser.py
index 55bf1aa87c..ab05c67d75 100644
--- a/Lib/idlelib/PathBrowser.py
+++ b/Lib/idlelib/PathBrowser.py
@@ -45,7 +45,7 @@ class DirBrowserTreeItem(TreeItem):
     def GetSubList(self):
         try:
             names = os.listdir(self.dir or os.curdir)
-        except os.error:
+        except OSError:
             return []
         packages = []
         for name in names:
diff --git a/Lib/idlelib/PyShell.py b/Lib/idlelib/PyShell.py
index c381f23b1e..b1ef4ca8c4 100644
--- a/Lib/idlelib/PyShell.py
+++ b/Lib/idlelib/PyShell.py
@@ -59,7 +59,7 @@ else:
         try:
             file.write(warnings.formatwarning(message, category, filename,
                                               lineno, line=line))
-        except IOError:
+        except OSError:
             pass  ## file (probably __stderr__) is invalid, warning dropped.
     warnings.showwarning = idle_showwarning
     def idle_formatwarning(message, category, filename, lineno, line=None):
@@ -213,7 +213,7 @@ class PyShellEditorWindow(EditorWindow):
         try:
             with open(self.breakpointPath, "r") as fp:
                 lines = fp.readlines()
-        except IOError:
+        except OSError:
             lines = []
         try:
             with open(self.breakpointPath, "w") as new_file:
@@ -224,7 +224,7 @@ class PyShellEditorWindow(EditorWindow):
                 breaks = self.breakpoints
                 if breaks:
                     new_file.write(filename + '=' + str(breaks) + '\n')
-        except IOError as err:
+        except OSError as err:
             if not getattr(self.root, "breakpoint_error_displayed", False):
                 self.root.breakpoint_error_displayed = True
                 tkMessageBox.showerror(title='IDLE Error',
@@ -398,7 +398,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
             try:
                 self.rpcclt = MyRPCClient(addr)
                 break
-            except socket.error as err:
+            except OSError as err:
                 pass
         else:
             self.display_port_binding_error()
@@ -532,7 +532,7 @@ class ModifiedInterpreter(InteractiveInterpreter):
             return
         try:
             response = clt.pollresponse(self.active_seq, wait=0.05)
-        except (EOFError, IOError, KeyboardInterrupt):
+        except (EOFError, OSError, KeyboardInterrupt):
             # lost connection or subprocess terminated itself, restart
             # [the KBI is from rpc.SocketIO.handle_EOF()]
             if self.tkconsole.closing:
@@ -1018,7 +1018,10 @@ class PyShell(OutputWindow):
                 self.close()
                 return False
         else:
-            nosub = "==== No Subprocess ===="
+            nosub = ("==== No Subprocess ====\n\n" +
+                    "WARNING: Running IDLE without a Subprocess is deprecated\n" +
+                    "and will be removed in a later version. See Help/IDLE Help\n" +
+                    "for details.\n\n")
             sys.displayhook = rpc.displayhook
 
         self.write("Python %s on %s\n%s\n%s" %
@@ -1373,7 +1376,8 @@ USAGE: idle  [-deins] [-t title] [file]*
        idle  [-dns] [-t title] - [arg]*
 
   -h         print this help message and exit
-  -n         run IDLE without a subprocess (see Help/IDLE Help for details)
+  -n         run IDLE without a subprocess (DEPRECATED,
+             see Help/IDLE Help for details)
 
 The following options will override the IDLE 'settings' configuration:
 
@@ -1450,6 +1454,8 @@ def main():
         if o == '-i':
             enable_shell = True
         if o == '-n':
+            print(" Warning: running IDLE without a subprocess is deprecated.",
+                  file=sys.stderr)
             use_subprocess = False
         if o == '-r':
             script = a
diff --git a/Lib/idlelib/TreeWidget.py b/Lib/idlelib/TreeWidget.py
index d4e524bb65..833896cd00 100644
--- a/Lib/idlelib/TreeWidget.py
+++ b/Lib/idlelib/TreeWidget.py
@@ -382,7 +382,7 @@ class FileTreeItem(TreeItem):
         try:
             os.rename(self.path, newpath)
             self.path = newpath
-        except os.error:
+        except OSError:
             pass
 
     def GetIconName(self):
@@ -395,7 +395,7 @@ class FileTreeItem(TreeItem):
     def GetSubList(self):
         try:
             names = os.listdir(self.path)
-        except os.error:
+        except OSError:
             return []
         names.sort(key = os.path.normcase)
         sublist = []
diff --git a/Lib/idlelib/configHandler.py b/Lib/idlelib/configHandler.py
index 5bf2668939..ea2010edec 100644
--- a/Lib/idlelib/configHandler.py
+++ b/Lib/idlelib/configHandler.py
@@ -142,7 +142,7 @@ class IdleUserConfParser(IdleConfParser):
             fname = self.file
             try:
                 cfgFile = open(fname, 'w')
-            except IOError:
+            except OSError:
                 os.unlink(fname)
                 cfgFile = open(fname, 'w')
             with cfgFile:
@@ -207,7 +207,7 @@ class IdleConf:
                         userDir+',\n but the path does not exist.\n')
                 try:
                     sys.stderr.write(warn)
-                except IOError:
+                except OSError:
                     pass
                 userDir = '~'
         if userDir == "~": # still no path to home!
@@ -217,7 +217,7 @@ class IdleConf:
         if not os.path.exists(userDir):
             try:
                 os.mkdir(userDir)
-            except (OSError, IOError):
+            except OSError:
                 warn = ('\n Warning: unable to create user config directory\n'+
                         userDir+'\n Check path and permissions.\n Exiting!\n\n')
                 sys.stderr.write(warn)
@@ -251,7 +251,7 @@ class IdleConf:
                                                      raw=raw)))
             try:
                 sys.stderr.write(warning)
-            except IOError:
+            except OSError:
                 pass
         try:
             if self.defaultCfg[configType].has_option(section,option):
@@ -268,7 +268,7 @@ class IdleConf:
                        (option, section, default))
             try:
                 sys.stderr.write(warning)
-            except IOError:
+            except OSError:
                 pass
         return default
 
@@ -380,7 +380,7 @@ class IdleConf:
                            (element, themeName, theme[element]))
                 try:
                     sys.stderr.write(warning)
-                except IOError:
+                except OSError:
                     pass
             colour=cfgParser.Get(themeName,element,default=theme[element])
             theme[element]=colour
@@ -637,7 +637,7 @@ class IdleConf:
                                (event, keySetName, keyBindings[event]))
                     try:
                         sys.stderr.write(warning)
-                    except IOError:
+                    except OSError:
                         pass
         return keyBindings
 
diff --git a/Lib/idlelib/help.txt b/Lib/idlelib/help.txt
index 815ee403da..c4e1231f1a 100644
--- a/Lib/idlelib/help.txt
+++ b/Lib/idlelib/help.txt
@@ -1,142 +1,185 @@
 [See the end of this file for ** TIPS ** on using IDLE !!]
 
-Click on the dotted line at the top of a menu to "tear it off": a
-separate window containing the menu is created.
-
-File Menu:
-
-	New Window       -- Create a new editing window
-	Open...          -- Open an existing file
-	Recent Files...  -- Open a list of recent files
-	Open Module...   -- Open an existing module (searches sys.path)
-	Class Browser    -- Show classes and methods in current file
-	Path Browser     -- Show sys.path directories, modules, classes
+IDLE is the Python IDE built with the tkinter GUI toolkit.
+
+IDLE has the following features:
+-coded in 100% pure Python, using the tkinter GUI toolkit
+-cross-platform: works on Windows, Unix, and OS X
+-multi-window text editor with multiple undo, Python colorizing, smart indent,
+call tips, and many other features
+-Python shell window (a.k.a interactive interpreter)
+-debugger (not complete, but you can set breakpoints, view and step)
+
+Menus:
+
+IDLE has two window types the Shell window and the Editor window. It is
+possible to have multiple editor windows simultaneously. IDLE's
+menus dynamically change based on which window is currently selected. Each menu
+documented below indicates which window type it is associated with. Click on
+the dotted line at the top of a menu to "tear it off": a separate window
+containing the menu is created (for Unix and Windows only).
+
+File Menu (Shell and Editor):
+
+        New Window       -- Create a new editing window
+        Open...          -- Open an existing file
+        Open Module...   -- Open an existing module (searches sys.path)
+        Recent Files...  -- Open a list of recent files
+        Class Browser    -- Show classes and methods in current file
+        Path Browser     -- Show sys.path directories, modules, classes,
                             and methods
-	---
-	Save             -- Save current window to the associated file (unsaved
-		            windows have a * before and after the window title)
-
-	Save As...       -- Save current window to new file, which becomes
-		            the associated file
-	Save Copy As...  -- Save current window to different file
-		            without changing the associated file
-	---
-	Print Window     -- Print the current window
-	---
-	Close            -- Close current window (asks to save if unsaved)
-	Exit             -- Close all windows, quit (asks to save if unsaved)
-
-Edit Menu:
-
-	Undo             -- Undo last change to current window
-                            (A maximum of 1000 changes may be undone)
-	Redo             -- Redo last undone change to current window
-	---
-	Cut              -- Copy a selection into system-wide clipboard,
+        ---
+        Save             -- Save current window to the associated file (unsaved
+                            windows have a * before and after the window title)
+
+        Save As...       -- Save current window to new file, which becomes
+                            the associated file
+        Save Copy As...  -- Save current window to different file
+                            without changing the associated file
+        ---
+        Print Window     -- Print the current window
+        ---
+        Close            -- Close current window (asks to save if unsaved)
+        Exit             -- Close all windows, quit (asks to save if unsaved)
+
+Edit Menu (Shell and Editor):
+
+        Undo             -- Undo last change to current window
+                            (a maximum of 1000 changes may be undone)
+        Redo             -- Redo last undone change to current window
+        ---
+        Cut              -- Copy a selection into system-wide clipboard,
                             then delete the selection
-	Copy             -- Copy selection into system-wide clipboard
-	Paste            -- Insert system-wide clipboard into window
-	Select All       -- Select the entire contents of the edit buffer
-	---
-	Find...          -- Open a search dialog box with many options
-	Find Again       -- Repeat last search
-	Find Selection   -- Search for the string in the selection
-	Find in Files... -- Open a search dialog box for searching files
-	Replace...       -- Open a search-and-replace dialog box
-	Go to Line       -- Ask for a line number and show that line
-	Show Calltip     -- Open a small window with function param hints
-	Show Completions -- Open a scroll window allowing selection keywords
-			    and attributes. (see '*TIPS*', below)
-	Show Parens	 -- Highlight the surrounding parenthesis
-	Expand Word      -- Expand the word you have typed to match another
-		            word in the same buffer; repeat to get a
+        Copy             -- Copy selection into system-wide clipboard
+        Paste            -- Insert system-wide clipboard into window
+        Select All       -- Select the entire contents of the edit buffer
+        ---
+        Find...          -- Open a search dialog box with many options
+        Find Again       -- Repeat last search
+        Find Selection   -- Search for the string in the selection
+        Find in Files... -- Open a search dialog box for searching files
+        Replace...       -- Open a search-and-replace dialog box
+        Go to Line       -- Ask for a line number and show that line
+        Expand Word      -- Expand the word you have typed to match another
+                            word in the same buffer; repeat to get a
                             different expansion
-
-Format Menu (only in Edit window):
-
-	Indent Region       -- Shift selected lines right 4 spaces
-	Dedent Region       -- Shift selected lines left 4 spaces
-	Comment Out Region  -- Insert ## in front of selected lines
-	Uncomment Region    -- Remove leading # or ## from selected lines
-	Tabify Region       -- Turns *leading* stretches of spaces into tabs
-		(Note: We recommend using 4 space blocks to indent Python code.)
-	Untabify Region     -- Turn *all* tabs into the right number of spaces
-	New Indent Width... -- Open dialog to change indent width
-	Format Paragraph    -- Reformat the current blank-line-separated
-                               paragraph
-
-Run Menu (only in Edit window):
-
-	Python Shell -- Open or wake up the Python shell window
-	---
-	Check Module -- Run a syntax check on the module
-	Run Module   -- Execute the current file in the __main__ namespace
-
-Shell Menu (only in Shell window):
-
-	View Last Restart -- Scroll the shell window to the last restart
-	Restart Shell     -- Restart the interpreter with a fresh environment
-
-Debug Menu (only in Shell window):
-
-	Go to File/Line   -- look around the insert point for a filename
-		             and line number, open the file, and show the line
-	Debugger (toggle) -- Run commands in the shell under the debugger
-	Stack Viewer      -- Show the stack traceback of the last exception
-	Auto-open Stack Viewer (toggle) -- Open stack viewer on traceback
-
-Options Menu:
-
-	Configure IDLE -- Open a configuration dialog.  Fonts, indentation,
+        Show Calltip     -- After an unclosed parenthesis for a function, open
+                            a small window with function parameter hints
+        Show Parens      -- Highlight the surrounding parenthesis
+        Show Completions -- Open a scroll window allowing selection keywords
+                            and attributes. (see '*TIPS*', below)
+
+Format Menu (Editor window only):
+
+        Indent Region       -- Shift selected lines right by the indent width
+                               (default 4 spaces)
+        Dedent Region       -- Shift selected lines left by the indent width
+                               (default 4 spaces)
+        Comment Out Region  -- Insert ## in front of selected lines
+        Uncomment Region    -- Remove leading # or ## from selected lines
+        Tabify Region       -- Turns *leading* stretches of spaces into tabs.
+                (Note: We recommend using 4 space blocks to indent Python code.)
+        Untabify Region     -- Turn *all* tabs into the corrent number of spaces
+        Toggle tabs         -- Open a dialog to switch between indenting with
+                               spaces and tabs.
+        New Indent Width... -- Open a dialog to change indent width.  The
+                               accepted default by the Python community is 4
+                               spaces.
+        Format Paragraph    -- Reformat the current blank-line-separated
+                               paragraph. All lines in the paragraph will be
+                               formatted to less than 80 columns.
+        ---
+        Strip trailing whitespace -- Removed any space characters after the end
+                                     of the last non-space character
+
+Run Menu (Editor window only):
+
+        Python Shell -- Open or wake up the Python shell window
+        ---
+        Check Module -- Check the syntax of the module currently open in the
+                        Editor window.  If the module has not been saved IDLE
+                        will prompt the user to save the code.
+        Run Module   -- Restart the shell to clean the environment, then
+                        execute the currently open module. If the module has
+                        not been saved IDLE will prompt the user to save the
+                        code.
+
+Shell Menu (Shell window only):
+
+        View Last Restart -- Scroll the shell window to the last Shell restart
+        Restart Shell     -- Restart the shell to clean the environment
+
+Debug Menu (Shell window only):
+
+        Go to File/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.  Available in the context
+                             menu of the Shell window.
+        Debugger (toggle) -- This feature is not complete and considered
+                             experimental. Run commands in the shell under the
+                             debugger.
+        Stack Viewer      -- Show the stack traceback of the last exception
+        Auto-open Stack Viewer (toggle) -- Toggle automatically opening the
+                                           stack viewer on unhandled
+                                           exception
+
+Options Menu (Shell and Editor):
+
+        Configure IDLE -- Open a configuration dialog.  Fonts, indentation,
                           keybindings, and color themes may be altered.
-                          Startup Preferences may be set, and Additional Help
-                          Sources can be specified.
-			  
-			  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
-			  shows the block context of the section of code
-			  which is scrolling off the top or the window.
-			  (Not present in Shell window.)
-
-Windows Menu:
-
-	Zoom Height -- toggles the window between configured size
-	and maximum height.
-	---
-	The rest of this menu lists the names of all open windows;
-	select one to bring it to the foreground (deiconifying it if
-	necessary).
+                          Startup Preferences may be set, and additional Help
+                          sources can be specified.
+
+        ---
+        Code Context (toggle) -- Open a pane at the top of the edit window
+                                 which shows the block context of the section
+                                 of code which is scrolling off the top or the
+                                 window. This is not present in the Shell
+                                 window only the Editor window.
+
+Windows Menu (Shell and Editor):
+
+        Zoom Height -- Toggles the window between normal size (40x80 initial
+        setting) and maximum height.  The initial size is in the Configure
+        IDLE dialog under the general tab.
+        ---
+        The rest of this menu lists the names of all open windows;
+        select one to bring it to the foreground (deiconifying it if
+        necessary).
 
 Help Menu:
 
-	About IDLE  -- Version, copyright, license, credits
-	IDLE Readme -- Background discussion and change details
-	---
-	IDLE Help   -- Display this file
-	Python Docs -- Access local Python documentation, if
-		       installed.  Otherwise, access www.python.org.
-	---
-	(Additional Help Sources may be added here)
-
-Edit context menu (Right-click / Control-click on OS X in Edit window):
-
-	Cut              -- Copy a selection into system-wide clipboard,
+        About IDLE  -- Version, copyright, license, credits
+        ---
+        IDLE Help   -- Display this file which is a help file for IDLE
+                       detailing the menu options, basic editing and navigation,
+                       and other tips.
+        Python Docs -- Access local Python documentation, if
+                       installed.  Or will start a web browser and open
+                       docs.python.org showing the latest Python documentation.
+        ---
+        Additional help sources may be added here with the Configure IDLE
+        dialog under the General tab.
+
+Editor context menu (Right-click / Control-click on OS X in Edit window):
+
+        Cut              -- Copy a selection into system-wide clipboard,
                             then delete the selection
-	Copy             -- Copy selection into system-wide clipboard
-	Paste            -- Insert system-wide clipboard into window
-	Set Breakpoint   -- Sets a breakpoint (when debugger open)
-	Clear Breakpoint -- Clears the breakpoint on that line
+        Copy             -- Copy selection into system-wide clipboard
+        Paste            -- Insert system-wide clipboard into window
+        Set Breakpoint   -- Sets a breakpoint. Breakpoints are only enabled
+                            when the debugger is open.
+        Clear Breakpoint -- Clears the breakpoint on that line
 
 Shell context menu (Right-click / Control-click on OS X in Shell window):
 
-	Cut              -- Copy a selection into system-wide clipboard,
+        Cut              -- Copy a selection into system-wide clipboard,
                             then delete the selection
-	Copy             -- Copy selection into system-wide clipboard
-	Paste            -- Insert system-wide clipboard into window
-	---
-	Go to file/line  -- Same as in Debug menu
+        Copy             -- Copy selection into system-wide clipboard
+        Paste            -- Insert system-wide clipboard into window
+        ---
+        Go to file/line  -- Same as in Debug menu
 
 
 ** TIPS **
@@ -144,160 +187,183 @@ Shell context menu (Right-click / Control-click on OS X in Shell window):
 
 Additional Help Sources:
 
-	Windows users can Google on zopeshelf.chm to access Zope help files in
-	the Windows help format.  The Additional Help Sources feature of the
-	configuration GUI supports .chm, along with any other filetypes
-	supported by your browser.  Supply a Menu Item title, and enter the
-	location in the Help File Path slot of the New Help Source dialog.  Use
-	http:// and/or www. to identify external URLs, or download the file and
-	browse for its path on your machine using the Browse button.
+        Windows users can Google on zopeshelf.chm to access Zope help files in
+        the Windows help format.  The Additional Help Sources feature of the
+        configuration GUI supports .chm, along with any other filetypes
+        supported by your browser.  Supply a Menu Item title, and enter the
+        location in the Help File Path slot of the New Help Source dialog.  Use
+        http:// and/or www. to identify external URLs, or download the file and
+        browse for its path on your machine using the Browse button.
 
-	All users can access the extensive sources of help, including
-	tutorials, available at www.python.org/doc.  Selected URLs can be added
-	or removed from the Help menu at any time using Configure IDLE.
+        All users can access the extensive sources of help, including
+        tutorials, available at docs.python.org.  Selected URLs can be added
+        or removed from the Help menu at any time using Configure IDLE.
 
 Basic editing and navigation:
 
-	Backspace deletes char to the left; DEL deletes char to the right.
-	Control-backspace deletes word left, Control-DEL deletes word right.
-	Arrow keys and Page Up/Down move around.
-	Control-left/right Arrow moves by words in a strange but useful way.
-	Home/End go to begin/end of line.
-	Control-Home/End go to begin/end of file.
-	Some useful Emacs bindings are inherited from Tcl/Tk:
-		Control-a     beginning of line
-		Control-e     end of line
-		Control-k     kill line (but doesn't put it in clipboard)
-		Control-l     center window around the insertion point
-	Standard Windows bindings may work on that platform.
-	Keybindings are selected in the Settings Dialog, look there.
+        Backspace deletes char to the left; DEL deletes char to the right.
+        Control-backspace deletes word left, Control-DEL deletes word right.
+        Arrow keys and Page Up/Down move around.
+        Control-left/right Arrow moves by words in a strange but useful way.
+        Home/End go to begin/end of line.
+        Control-Home/End go to begin/end of file.
+        Some useful Emacs bindings are inherited from Tcl/Tk:
+                Control-a     beginning of line
+                Control-e     end of line
+                Control-k     kill line (but doesn't put it in clipboard)
+                Control-l     center window around the insertion point
+        Standard keybindings (like Control-c to copy and Control-v to
+        paste) may work.  Keybindings are selected in the Configure IDLE
+        dialog.
 
 Automatic indentation:
 
-	After a block-opening statement, the next line is indented by 4 spaces
-	(in the Python Shell window by one tab).  After certain keywords
-	(break, return etc.) the next line is dedented.  In leading
-	indentation, Backspace deletes up to 4 spaces if they are there.  Tab
-	inserts spaces (in the Python Shell window one tab), number depends on
-	Indent Width.  (N.B. Currently tabs are restricted to four spaces due
-	to Tcl/Tk issues.)
+        After a block-opening statement, the next line is indented by 4 spaces
+        (in the Python Shell window by one tab).  After certain keywords
+        (break, return etc.) the next line is dedented.  In leading
+        indentation, Backspace deletes up to 4 spaces if they are there.  Tab
+        inserts spaces (in the Python Shell window one tab), number depends on
+        Indent Width. Currently tabs are restricted to four spaces due
+        to Tcl/Tk limitations.
 
         See also the indent/dedent region commands in the edit menu.
 
 Completions:
 
-	Completions are supplied for functions, classes, and attributes of
-	classes, both built-in and user-defined.  Completions are also provided
-	for filenames.
-
-	The AutoCompleteWindow (ACW) will open after a predefined delay
-	(default is two seconds) after a '.' or (in a string) an os.sep is
-	typed.  If after one of those characters (plus zero or more other
-	characters) you type a Tab the ACW will open immediately if a possible
-	continuation is found.
-
-	If there is only one possible completion for the characters entered, a
-	Tab will supply that completion without opening the ACW.
-
-	'Show Completions' will force open a completions window.  In an empty
-	string, this will contain the files in the current directory.  On a
-	blank line, it will contain the built-in and user-defined functions and
-	classes in the current name spaces, plus any modules imported.  If some
-	characters have been entered, the ACW will attempt to be more specific.
-
-	If string of characters is typed, the ACW selection will jump to the
-	entry most closely matching those characters. Entering a Tab will cause
-	the longest non-ambiguous match to be entered in the Edit window or
-	Shell.  Two Tabs in a row will supply the current ACW selection, as
-	will Return or a double click.  Cursor keys, Page Up/Down, mouse
-	selection, and the scrollwheel all operate on the ACW.
-
-	'Hidden' attributes can be accessed by typing the beginning of hidden
-	name after a '.'.  e.g. '_'.  This allows access to modules with
-	'__all__' set, or to class-private attributes.
-
-	Completions and the 'Expand Word' facility can save a lot of typing!
-
-	Completions are currently limited to those in the namespaces.  Names in
-	an Edit window which are not via __main__ or sys.modules will not be
-	found.  Run the module once with your imports to correct this
-	situation.  Note that IDLE itself places quite a few modules in
-	sys.modules, so much can be found by default, e.g. the re module.
-
-	If you don't like the ACW popping up unbidden, simply make the delay
-	longer or disable the extension.  OTOH, you could make the delay zero.
-
-	You could also switch off the CallTips extension.  (We will be adding
-	a delay to the call tip window.)
+        Completions are supplied for functions, classes, and attributes of
+        classes, both built-in and user-defined.  Completions are also provided
+        for filenames.
+
+        The AutoCompleteWindow (ACW) will open after a predefined delay
+        (default is two seconds) after a '.' or (in a string) an os.sep is
+        typed.  If after one of those characters (plus zero or more other
+        characters) a tab is typed the ACW will open immediately if a possible
+        continuation is found.
+
+        If there is only one possible completion for the characters entered, a
+        tab will supply that completion without opening the ACW.
+
+        'Show Completions' will force open a completions window, by default the
+        Control-space keys will open a completions window.  In an empty
+        string, this will contain the files in the current directory.  On a
+        blank line, it will contain the built-in and user-defined functions and
+        classes in the current name spaces, plus any modules imported.  If some
+        characters have been entered, the ACW will attempt to be more specific.
+
+        If string of characters is typed, the ACW selection will jump to the
+        entry most closely matching those characters. Entering a tab will cause
+        the longest non-ambiguous match to be entered in the Edit window or
+        Shell.  Two tabs in a row will supply the current ACW selection, as
+        will return or a double click.  Cursor keys, Page Up/Down, mouse
+        selection, and the scroll wheel all operate on the ACW.
+
+        "Hidden" attributes can be accessed by typing the beginning of hidden
+        name after a '.',  e.g. '_'.  This allows access to modules with
+        '__all__' set, or to class-private attributes.
+
+        Completions and the 'Expand Word' facility can save a lot of typing!
+
+        Completions are currently limited to those in the namespaces.  Names in
+        an Editor window which are not via __main__ or sys.modules will not be
+        found.  Run the module once with your imports to correct this
+        situation.  Note that IDLE itself places quite a few modules in
+        sys.modules, so much can be found by default, e.g. the re module.
+
+        If you don't like the ACW popping up unbidden, simply make the delay
+        longer or disable the extension.  Or another option is the delay could
+        be set to zero. Another alternative to preventing ACW popups is to
+        disable the call tips extension.
 
 Python Shell window:
 
-	Control-c interrupts executing command.
-	Control-d sends end-of-file; closes window if typed at >>> prompt
-		(this is Control-z on Windows).
+        Control-c interrupts executing command.
+        Control-d sends end-of-file; closes window if typed at >>> prompt
+                (this is Control-z on Windows).
+        Alt-/ expand word is also useful to reduce typing.
 
     Command history:
 
-	Alt-p retrieves previous command matching what you have typed.
-	Alt-n retrieves next.
-	      (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.
+        Alt-p retrieves previous command matching what you have typed. On OS X
+        use Control-p.
+        Alt-n retrieves next. On OS X use Control-n.
+        Return while cursor is on a previous command retrieves that command.
 
     Syntax colors:
 
-	The coloring is applied in a background "thread", so you may
-	occasionally see uncolorized text.  To change the color
-	scheme, use the Configure IDLE / Highlighting dialog.
+        The coloring is applied in a background "thread", so you may
+        occasionally see uncolorized text.  To change the color
+        scheme, use the Configure IDLE / Highlighting dialog.
 
     Python default syntax colors:
 
-	Keywords	orange
-	Builtins	royal purple
-	Strings		green
-	Comments	red
-	Definitions	blue
+        Keywords        orange
+        Builtins        royal purple
+        Strings         green
+        Comments        red
+        Definitions     blue
 
     Shell default colors:
 
-	Console output	brown
-	stdout		blue
-	stderr		red
-	stdin		black
+        Console output  brown
+        stdout          blue
+        stderr          red
+        stdin           black
 
 Other preferences:
 
-	The font preferences, keybinding, and startup preferences can
-	be changed using the Settings dialog.
+        The font preferences, highlighting, keys, and general preferences can
+        be changed via the Configure IDLE menu option.  Be sure to note that
+        keys can be user defined, IDLE ships with four built in key sets. In
+        addition a user can create a custom key set in the Configure IDLE
+        dialog under the keys tab.
 
 Command line usage:
 
-	Enter idle -h at the command prompt to get a usage message.
-
-Running without a subprocess:
-
-	If IDLE is started with the -n command line switch it will run in a
-	single process and will not create the subprocess which runs the RPC
-	Python execution server.  This can be useful if Python cannot create
-	the subprocess or the RPC socket interface on your platform.  However,
-	in this mode user code is not isolated from IDLE itself.  Also, the
-	environment is not restarted when Run/Run Module (F5) is selected.  If
-	your code has been modified, you must reload() the affected modules and
-	re-import any specific items (e.g. from foo import baz) if the changes
-	are to take effect.  For these reasons, it is preferable to run IDLE
-	with the default subprocess if at all possible.
+        Enter idle -h at the command prompt to get a usage message.
+
+        idle.py [-c command] [-d] [-e] [-s] [-t title] [arg] ...
+
+        -c command  run this command
+        -d          enable debugger
+        -e          edit mode; arguments are files to be edited
+        -s          run $IDLESTARTUP or $PYTHONSTARTUP first
+        -t title    set title of shell window
+
+        If there are arguments:
+        1. If -e is used, arguments are files opened for editing and sys.argv
+           reflects the arguments passed to IDLE itself.
+        2. Otherwise, if -c is used, all arguments are placed in
+           sys.argv[1:...], with sys.argv[0] set to -c.
+        3. Otherwise, if neither -e nor -c is used, the first argument is a
+           script which is executed with the remaining arguments in
+           sys.argv[1:...]  and sys.argv[0] set to the script name.  If the
+           script name is -, no script is executed but an interactive Python
+           session is started; the arguments are still available in sys.argv.
+
+Running without a subprocess: (DEPRECATED in Python 3.5 see Issue 16123)
+
+        If IDLE is started with the -n command line switch it will run in a
+        single process and will not create the subprocess which runs the RPC
+        Python execution server.  This can be useful if Python cannot create
+        the subprocess or the RPC socket interface on your platform.  However,
+        in this mode user code is not isolated from IDLE itself.  Also, the
+        environment is not restarted when Run/Run Module (F5) is selected.  If
+        your code has been modified, you must reload() the affected modules and
+        re-import any specific items (e.g. from foo import baz) if the changes
+        are to take effect.  For these reasons, it is preferable to run IDLE
+        with the default subprocess if at all possible.
 
 Extensions:
 
-	IDLE contains an extension facility.  See the beginning of
-	config-extensions.def in the idlelib directory for further information.
-	The default extensions are currently:
-
-		FormatParagraph
-		AutoExpand
-		ZoomHeight
-		ScriptBinding
-		CallTips
-		ParenMatch
-		AutoComplete
-		CodeContext
+        IDLE contains an extension facility.  See the beginning of
+        config-extensions.def in the idlelib directory for further information.
+        The default extensions are currently:
+
+                FormatParagraph
+                AutoExpand
+                ZoomHeight
+                ScriptBinding
+                CallTips
+                ParenMatch
+                AutoComplete
+                CodeContext
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 13b2b9baeb..efe96a478d 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.3.1"
+IDLE_VERSION = "3.4.0a0"
diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py
index 6093ce216e..9c51b8f6b5 100644
--- a/Lib/idlelib/rpc.py
+++ b/Lib/idlelib/rpc.py
@@ -199,7 +199,7 @@ class SocketIO(object):
             raise
         except KeyboardInterrupt:
             raise
-        except socket.error:
+        except OSError:
             raise
         except Exception as ex:
             return ("CALLEXC", ex)
@@ -339,8 +339,8 @@ class SocketIO(object):
                 r, w, x = select.select([], [self.sock], [])
                 n = self.sock.send(s[:BUFSIZE])
             except (AttributeError, TypeError):
-                raise IOError("socket no longer exists")
-            except socket.error:
+                raise OSError("socket no longer exists")
+            except OSError:
                 raise
             else:
                 s = s[n:]
@@ -357,7 +357,7 @@ class SocketIO(object):
                 return None
             try:
                 s = self.sock.recv(BUFSIZE)
-            except socket.error:
+            except OSError:
                 raise EOFError
             if len(s) == 0:
                 raise EOFError
@@ -537,7 +537,7 @@ class RPCClient(SocketIO):
             SocketIO.__init__(self, working_sock)
         else:
             print("** Invalid host: ", address, file=sys.__stderr__)
-            raise socket.error
+            raise OSError
 
     def get_remote_proxy(self, oid):
         return RPCProxy(self, oid)
diff --git a/Lib/idlelib/run.py b/Lib/idlelib/run.py
index d10591246f..c66679cde9 100644
--- a/Lib/idlelib/run.py
+++ b/Lib/idlelib/run.py
@@ -137,8 +137,8 @@ def manage_socket(address):
         try:
             server = MyRPCServer(address, MyHandler)
             break
-        except socket.error as err:
-            print("IDLE Subprocess: socket error: " + err.args[1] +
+        except OSError as err:
+            print("IDLE Subprocess: OSError: " + err.args[1] +
                   ", retrying....", file=sys.__stderr__)
             socket_error = err
     else:
diff --git a/Lib/idlelib/textView.py b/Lib/idlelib/textView.py
index 1eaa4649ed..ae1f195a5b 100644
--- a/Lib/idlelib/textView.py
+++ b/Lib/idlelib/textView.py
@@ -66,7 +66,7 @@ def view_file(parent, title, filename, encoding=None, modal=True):
     try:
         with open(filename, 'r', encoding=encoding) as file:
             contents = file.read()
-    except IOError:
+    except OSError:
         import tkinter.messagebox as tkMessageBox
         tkMessageBox.showerror(title='File Load Error',
                                message='Unable to load file %r .' % filename,