Issue #24245: Eliminated senseless expect clauses that have no any effect in

IDLE.  Patch by Martin Panter.

Lib/idlelib/idle.pyw

@@ -2,11 +2,7 @@ try:
     import idlelib.PyShell
 except ImportError:
     # IDLE is not installed, but maybe PyShell is on sys.path:
-    try:
     import PyShell
-    except ImportError:
-        raise
-    else:
     import os
     idledir = os.path.dirname(os.path.abspath(PyShell.__file__))
     if idledir != os.getcwd():

Lib/idlelib/rpc.py

@@ -332,9 +332,6 @@ class SocketIO(object):
                 n = self.sock.send(s[:BUFSIZE])
             except (AttributeError, TypeError):
                 raise IOError, "socket no longer exists"
-            except socket.error:
-                raise
-            else:
             s = s[n:]
 
     buffer = ""