[Python-checkins] cpython: Remove unused or redundant imports in concurrent.futures and multiprocessing.

Fri Nov 11 20:07:01 CET 2011

http://hg.python.org/cpython/rev/60fd58a56f44
changeset: 73513:60fd58a56f44
user: Florent Xicluna <florent.xicluna at gmail.com>
date: Fri Nov 11 20:05:50 2011 +0100
summary:
 Remove unused or redundant imports in concurrent.futures and multiprocessing.
files:
 Lib/concurrent/futures/_base.py | 1 -
 Lib/concurrent/futures/process.py | 3 +--
 Lib/concurrent/futures/thread.py | 2 +-
 Lib/multiprocessing/dummy/__init__.py | 2 --
 Lib/multiprocessing/forking.py | 8 ++------
 Lib/multiprocessing/heap.py | 1 -
 Lib/multiprocessing/managers.py | 6 +-----
 Lib/multiprocessing/queues.py | 1 -
 Lib/multiprocessing/reduction.py | 2 --
 Lib/multiprocessing/sharedctypes.py | 1 -
 Lib/multiprocessing/synchronize.py | 5 +----
 Lib/multiprocessing/util.py | 3 +--
 12 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -4,7 +4,6 @@
 __author__ = 'Brian Quinlan (brian at sweetapp.com)'
 
 import collections
-import functools
 import logging
 import threading
 import time
diff --git a/Lib/concurrent/futures/process.py b/Lib/concurrent/futures/process.py
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -221,7 +221,7 @@
 assert sentinels
 try:
 result_item = result_queue.get(sentinels=sentinels)
- except SentinelReady as e:
+ except SentinelReady:
 # Mark the process pool broken so that submits fail right now.
 executor = executor_reference()
 if executor is not None:
@@ -291,7 +291,6 @@
 raise NotImplementedError(_system_limited)
 _system_limits_checked = True
 try:
- import os
 nsems_max = os.sysconf("SC_SEM_NSEMS_MAX")
 except (AttributeError, ValueError):
 # sysconf not available or setting not available
diff --git a/Lib/concurrent/futures/thread.py b/Lib/concurrent/futures/thread.py
--- a/Lib/concurrent/futures/thread.py
+++ b/Lib/concurrent/futures/thread.py
@@ -74,7 +74,7 @@
 work_queue.put(None)
 return
 del executor
- except BaseException as e:
+ except BaseException:
 _base.LOGGER.critical('Exception in worker', exc_info=True)
 
 class ThreadPoolExecutor(_base.Executor):
diff --git a/Lib/multiprocessing/dummy/__init__.py b/Lib/multiprocessing/dummy/__init__.py
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -46,9 +46,7 @@
 import sys
 import weakref
 import array
-import itertools
 
-from multiprocessing import TimeoutError, cpu_count
 from multiprocessing.dummy.connection import Pipe
 from threading import Lock, RLock, Semaphore, BoundedSemaphore
 from threading import Event, Condition
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -35,7 +35,6 @@
 import os
 import sys
 import signal
-import select
 
 from multiprocessing import util, process
 
@@ -101,7 +100,6 @@
 #
 
 if sys.platform != 'win32':
- import time
 import select
 
 exit = os._exit
@@ -170,7 +168,7 @@
 if self.returncode is None:
 try:
 os.kill(self.pid, signal.SIGTERM)
- except OSError as e:
+ except OSError:
 if self.wait(timeout=0.1) is None:
 raise
 
@@ -186,11 +184,9 @@
 import _thread
 import msvcrt
 import _subprocess
- import time
 
- from pickle import dump, load, HIGHEST_PROTOCOL
+ from pickle import load, HIGHEST_PROTOCOL
 from _multiprocessing import win32
- from .util import Finalize
 
 def dump(obj, file, protocol=None):
 ForkingPickler(file, protocol).dump(obj)
diff --git a/Lib/multiprocessing/heap.py b/Lib/multiprocessing/heap.py
--- a/Lib/multiprocessing/heap.py
+++ b/Lib/multiprocessing/heap.py
@@ -34,7 +34,6 @@
 
 import bisect
 import mmap
-import tempfile
 import os
 import sys
 import threading
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -39,19 +39,15 @@
 # Imports
 #
 
-import os
 import sys
-import weakref
 import threading
 import array
 import queue
 
 from traceback import format_exc
-from pickle import PicklingError
 from multiprocessing import Process, current_process, active_children, Pool, util, connection
 from multiprocessing.process import AuthenticationString
-from multiprocessing.forking import exit, Popen, assert_spawning, ForkingPickler
-from multiprocessing.util import Finalize, info
+from multiprocessing.forking import exit, Popen, ForkingPickler
 
 #
 # Register some things for pickling
diff --git a/Lib/multiprocessing/queues.py b/Lib/multiprocessing/queues.py
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -39,7 +39,6 @@
 import threading
 import collections
 import time
-import atexit
 import weakref
 import errno
 
diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -41,7 +41,6 @@
 import threading
 import struct
 
-import _multiprocessing
 from multiprocessing import current_process
 from multiprocessing.forking import Popen, duplicate, close, ForkingPickler
 from multiprocessing.util import register_after_fork, debug, sub_debug
@@ -61,7 +60,6 @@
 #
 
 if sys.platform == 'win32':
- import _subprocess
 from _multiprocessing import win32
 
 def send_handle(conn, handle, destination_pid):
diff --git a/Lib/multiprocessing/sharedctypes.py b/Lib/multiprocessing/sharedctypes.py
--- a/Lib/multiprocessing/sharedctypes.py
+++ b/Lib/multiprocessing/sharedctypes.py
@@ -32,7 +32,6 @@
 # SUCH DAMAGE.
 #
 
-import sys
 import ctypes
 import weakref
 
diff --git a/Lib/multiprocessing/synchronize.py b/Lib/multiprocessing/synchronize.py
--- a/Lib/multiprocessing/synchronize.py
+++ b/Lib/multiprocessing/synchronize.py
@@ -37,14 +37,11 @@
 ]
 
 import threading
-import os
 import sys
 
-from time import time as _time, sleep as _sleep
-
 import _multiprocessing
 from multiprocessing.process import current_process
-from multiprocessing.util import Finalize, register_after_fork, debug
+from multiprocessing.util import register_after_fork, debug
 from multiprocessing.forking import assert_spawning, Popen
 
 # Try to import the mp.synchronize module cleanly, if it fails
diff --git a/Lib/multiprocessing/util.py b/Lib/multiprocessing/util.py
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -36,7 +36,6 @@
 import itertools
 import weakref
 import atexit
-import select
 import threading # we want threading to install it's
 # cleanup function before multiprocessing does
 
@@ -86,7 +85,7 @@
 Returns logger used by multiprocessing
 '''
 global _logger
- import logging, atexit
+ import logging
 
 logging._acquireLock()
 try:
-- 
Repository URL: http://hg.python.org/cpython
