From ef94869f4fba32cbae214e4763a61e69d0cdad12 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Wed, 20 May 2015 16:15:02 +0300 Subject: Issue #24245: Eliminated senseless expect clauses that have no any effect in IDLE. Patch by Martin Panter. --- Lib/idlelib/idle.pyw | 26 +++++++++++--------------- Lib/idlelib/rpc.py | 5 +---- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/Lib/idlelib/idle.pyw b/Lib/idlelib/idle.pyw index 0db5fd4..142cb32 100644 --- a/Lib/idlelib/idle.pyw +++ b/Lib/idlelib/idle.pyw @@ -2,20 +2,16 @@ try: import idlelib.PyShell except ImportError: # IDLE is not installed, but maybe PyShell is on sys.path: - try: - from . import PyShell - except ImportError: - raise - else: - import os - idledir = os.path.dirname(os.path.abspath(PyShell.__file__)) - if idledir != os.getcwd(): - # We're not in the IDLE directory, help the subprocess find run.py - pypath = os.environ.get('PYTHONPATH', '') - if pypath: - os.environ['PYTHONPATH'] = pypath + ':' + idledir - else: - os.environ['PYTHONPATH'] = idledir - PyShell.main() + from . import PyShell + import os + idledir = os.path.dirname(os.path.abspath(PyShell.__file__)) + if idledir != os.getcwd(): + # We're not in the IDLE directory, help the subprocess find run.py + pypath = os.environ.get('PYTHONPATH', '') + if pypath: + os.environ['PYTHONPATH'] = pypath + ':' + idledir + else: + os.environ['PYTHONPATH'] = idledir + PyShell.main() else: idlelib.PyShell.main() diff --git a/Lib/idlelib/rpc.py b/Lib/idlelib/rpc.py index f2aae51..aa33041 100644 --- a/Lib/idlelib/rpc.py +++ b/Lib/idlelib/rpc.py @@ -340,10 +340,7 @@ class SocketIO(object): n = self.sock.send(s[:BUFSIZE]) except (AttributeError, TypeError): raise OSError("socket no longer exists") - except OSError: - raise - else: - s = s[n:] + s = s[n:] buff = b'' bufneed = 4 -- cgit v0.12