diff -r 72889bf8531d Lib/distutils/spawn.py --- a/Lib/distutils/spawn.py Tue Mar 18 13:21:29 2014 +0100 +++ b/Lib/distutils/spawn.py Wed Mar 19 11:52:23 2014 +0100 @@ -36,8 +36,6 @@ def spawn(cmd, search_path=1, verbose=0, _spawn_posix(cmd, search_path, dry_run=dry_run) elif os.name == 'nt': _spawn_nt(cmd, search_path, dry_run=dry_run) - elif os.name == 'os2': - _spawn_os2(cmd, search_path, dry_run=dry_run) else: raise DistutilsPlatformError( "don't know how to spawn programs on platform '%s'" % os.name) diff -r 72889bf8531d Lib/ftplib.py --- a/Lib/ftplib.py Tue Mar 18 13:21:29 2014 +0100 +++ b/Lib/ftplib.py Wed Mar 19 11:52:23 2014 +0100 @@ -320,7 +320,6 @@ class FTP: raise err else: raise OSError("getaddrinfo returns an empty list") - raise OSError(msg) sock.listen(1) port = sock.getsockname()[1] # Get proper port host = self.sock.getsockname()[0] # Get proper host diff -r 72889bf8531d Lib/multiprocessing/connection.py --- a/Lib/multiprocessing/connection.py Tue Mar 18 13:21:29 2014 +0100 +++ b/Lib/multiprocessing/connection.py Wed Mar 19 11:52:23 2014 +0100 @@ -29,7 +29,7 @@ from .reduction import ForkingPickler try: import _winapi - from _winapi import WAIT_OBJECT_0, WAIT_TIMEOUT, INFINITE + from _winapi import WAIT_OBJECT_0, WAIT_ABANDONED_0, WAIT_TIMEOUT, INFINITE except ImportError: if sys.platform == 'win32': raise diff -r 72889bf8531d Lib/tempfile.py --- a/Lib/tempfile.py Tue Mar 18 13:21:29 2014 +0100 +++ b/Lib/tempfile.py Wed Mar 19 11:52:23 2014 +0100 @@ -72,7 +72,7 @@ else: # file doesn't exist. def _stat(fn): fd = _os.open(fn, _os.O_RDONLY) - os.close(fd) + _os.close(fd) def _exists(fn): try: