diff options
| -rw-r--r-- | Lib/distutils/spawn.py | 2 | ||||
| -rw-r--r-- | Lib/ftplib.py | 1 | ||||
| -rw-r--r-- | Lib/multiprocessing/connection.py | 2 | ||||
| -rw-r--r-- | Lib/tempfile.py | 2 |
4 files changed, 2 insertions, 5 deletions
diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py index d9cf950a9b..22e87e8fdb 100644 --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -36,8 +36,6 @@ def spawn(cmd, search_path=1, verbose=0, dry_run=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 --git a/Lib/ftplib.py b/Lib/ftplib.py index 2cc470258e..c83be2b319 100644 --- a/Lib/ftplib.py +++ b/Lib/ftplib.py @@ -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 --git a/Lib/multiprocessing/connection.py b/Lib/multiprocessing/connection.py index 09ec4fc22a..9b11a69599 100644 --- a/Lib/multiprocessing/connection.py +++ b/Lib/multiprocessing/connection.py @@ -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 --git a/Lib/tempfile.py b/Lib/tempfile.py index 05d4cabe60..57e8a829ec 100644 --- a/Lib/tempfile.py +++ b/Lib/tempfile.py @@ -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: |