summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2012-02-04 00:09:38 (GMT)
committerBenjamin Peterson <benjamin@python.org>2012-02-04 00:09:38 (GMT)
commit7bbb6e8cf9832195cdf5ef6abb2109011a99174c (patch)
tree5d2d496795edfd05456ca378c7d042ad869c9250 /Lib
parentf16d6771c7bb9d5c1b8813cd2d4efc3cee0bc646 (diff)
parent050a05aeef64df285c4c261cce1fcf5b3335e75d (diff)
downloadcpython-7bbb6e8cf9832195cdf5ef6abb2109011a99174c.zip
cpython-7bbb6e8cf9832195cdf5ef6abb2109011a99174c.tar.gz
cpython-7bbb6e8cf9832195cdf5ef6abb2109011a99174c.tar.bz2
merge 3.2
Diffstat (limited to 'Lib')
-rw-r--r--Lib/threading.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index e85e269..2a0d8ad 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -5,7 +5,6 @@ import _thread
from time import time as _time, sleep as _sleep
from traceback import format_exc as _format_exc
-from collections import deque
from _weakrefset import WeakSet
# Note regarding PEP 8 compliant names