summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorent Xicluna <florent.xicluna@gmail.com>2011-11-11 19:05:50 (GMT)
committerFlorent Xicluna <florent.xicluna@gmail.com>2011-11-11 19:05:50 (GMT)
commit04842a84c31d82d9c2255e6575344412c58e518e (patch)
tree9f4627fbf8715735104187c417d1c5e2f7f6ebc5
parentf8240d6564c6d8f166256fca9b0fb6e9b89c7db1 (diff)
downloadcpython-04842a84c31d82d9c2255e6575344412c58e518e.zip
cpython-04842a84c31d82d9c2255e6575344412c58e518e.tar.gz
cpython-04842a84c31d82d9c2255e6575344412c58e518e.tar.bz2
Remove unused or redundant imports in concurrent.futures and multiprocessing.
-rw-r--r--Lib/concurrent/futures/_base.py1
-rw-r--r--Lib/concurrent/futures/process.py3
-rw-r--r--Lib/concurrent/futures/thread.py2
-rw-r--r--Lib/multiprocessing/dummy/__init__.py2
-rw-r--r--Lib/multiprocessing/forking.py8
-rw-r--r--Lib/multiprocessing/heap.py1
-rw-r--r--Lib/multiprocessing/managers.py6
-rw-r--r--Lib/multiprocessing/queues.py1
-rw-r--r--Lib/multiprocessing/reduction.py2
-rw-r--r--Lib/multiprocessing/sharedctypes.py1
-rw-r--r--Lib/multiprocessing/synchronize.py5
-rw-r--r--Lib/multiprocessing/util.py3
12 files changed, 7 insertions, 28 deletions
diff --git a/Lib/concurrent/futures/_base.py b/Lib/concurrent/futures/_base.py
index 6cfded3..3b097b5 100644
--- a/Lib/concurrent/futures/_base.py
+++ b/Lib/concurrent/futures/_base.py
@@ -4,7 +4,6 @@
__author__ = 'Brian Quinlan (brian@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
index 9b2e0f3..0575146 100644
--- a/Lib/concurrent/futures/process.py
+++ b/Lib/concurrent/futures/process.py
@@ -221,7 +221,7 @@ def _queue_management_worker(executor_reference,
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 @@ def _check_system_limits():
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
index fbac088..95bb682 100644
--- a/Lib/concurrent/futures/thread.py
+++ b/Lib/concurrent/futures/thread.py
@@ -74,7 +74,7 @@ def _worker(executor_reference, work_queue):
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
index 60add92..056acfc 100644
--- a/Lib/multiprocessing/dummy/__init__.py
+++ b/Lib/multiprocessing/dummy/__init__.py
@@ -46,9 +46,7 @@ import threading
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
index a2c61ef..47746cb 100644
--- 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 @@ else:
#
if sys.platform != 'win32':
- import time
import select
exit = os._exit
@@ -170,7 +168,7 @@ if sys.platform != 'win32':
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 @@ else:
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
index 0a25ef0..7366bd2 100644
--- 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
index 5a57288..f42d353 100644
--- a/Lib/multiprocessing/managers.py
+++ b/Lib/multiprocessing/managers.py
@@ -39,19 +39,15 @@ __all__ = [ 'BaseManager', 'SyncManager', 'BaseProxy', 'Token' ]
# 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
index cf51307..c4f9cda 100644
--- a/Lib/multiprocessing/queues.py
+++ b/Lib/multiprocessing/queues.py
@@ -39,7 +39,6 @@ import os
import threading
import collections
import time
-import atexit
import weakref
import errno
diff --git a/Lib/multiprocessing/reduction.py b/Lib/multiprocessing/reduction.py
index 042a136..dda4a41 100644
--- a/Lib/multiprocessing/reduction.py
+++ b/Lib/multiprocessing/reduction.py
@@ -41,7 +41,6 @@ import socket
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 not(sys.platform == 'win32' or (hasattr(socket, 'CMSG_LEN') and
#
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
index 1e694da..5826379 100644
--- 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
index 70ae825..e35bbff 100644
--- a/Lib/multiprocessing/synchronize.py
+++ b/Lib/multiprocessing/synchronize.py
@@ -37,14 +37,11 @@ __all__ = [
]
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
index 5c26683..0bbb87e 100644
--- a/Lib/multiprocessing/util.py
+++ b/Lib/multiprocessing/util.py
@@ -36,7 +36,6 @@ import functools
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 @@ def get_logger():
Returns logger used by multiprocessing
'''
global _logger
- import logging, atexit
+ import logging
logging._acquireLock()
try: