1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
IDLE.  Patch by Martin Panter.
This commit is contained in:
Serhiy Storchaka 2015-05-20 16:15:02 +03:00
parent 5d6b7b1cb7
commit ef94869f4f
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Lib/idlelib/idle.pyw
View File

@ -2,20 +2,16 @@ try:
import idlelib.PyShell import idlelib.PyShell
except ImportError: except ImportError:
# IDLE is not installed, but maybe PyShell is on sys.path: # IDLE is not installed, but maybe PyShell is on sys.path:
try: from . import PyShell
from . import PyShell import os
except ImportError: idledir = os.path.dirname(os.path.abspath(PyShell.__file__))
raise if idledir != os.getcwd():
else: # We're not in the IDLE directory, help the subprocess find run.py
import os pypath = os.environ.get('PYTHONPATH', '')
idledir = os.path.dirname(os.path.abspath(PyShell.__file__)) if pypath:
if idledir != os.getcwd(): os.environ['PYTHONPATH'] = pypath + ':' + idledir
# We're not in the IDLE directory, help the subprocess find run.py else:
pypath = os.environ.get('PYTHONPATH', '') os.environ['PYTHONPATH'] = idledir
if pypath: PyShell.main()
os.environ['PYTHONPATH'] = pypath + ':' + idledir
else:
os.environ['PYTHONPATH'] = idledir
PyShell.main()
else: else:
idlelib.PyShell.main() idlelib.PyShell.main()

5
Lib/idlelib/rpc.py
View File

@ -340,10 +340,7 @@ class SocketIO(object):
n = self.sock.send(s[:BUFSIZE]) n = self.sock.send(s[:BUFSIZE])
except (AttributeError, TypeError): except (AttributeError, TypeError):
raise OSError("socket no longer exists") raise OSError("socket no longer exists")
except OSError: s = s[n:]
raise
else:
s = s[n:]
buff = b'' buff = b''
bufneed = 4 bufneed = 4