summaryrefslogtreecommitdiff
path: root/Lib/threading.py
diff options
context:
space:
mode:
authorGregory P. Smith <greg@krypto.org>2013-03-20 20:53:21 -0700
committerGregory P. Smith <greg@krypto.org>2013-03-20 20:53:21 -0700
commitf72119d10f3443972d06c908dc9e85024007649c (patch)
tree90648bc40ce80b99ee329d9d9abdd02144838fb4 /Lib/threading.py
parent40a2160a096edbf6f85756dca9522ba83dd893d9 (diff)
parent3030728138593557fee3a8e2e1ccb2375f8d649c (diff)
downloadcpython-git-f72119d10f3443972d06c908dc9e85024007649c.tar.gz
merge heads
Diffstat (limited to 'Lib/threading.py')
-rw-r--r--Lib/threading.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/Lib/threading.py b/Lib/threading.py
index 415a993b0a..80dd51f521 100644
--- a/Lib/threading.py
+++ b/Lib/threading.py
@@ -10,11 +10,10 @@ except ImportError:
from time import time as _time
from traceback import format_exc as _format_exc
from _weakrefset import WeakSet
+from itertools import islice as _islice
try:
- from _itertools import islice as _slice
from _collections import deque as _deque
except ImportError:
- from itertools import islice as _islice
from collections import deque as _deque
# Note regarding PEP 8 compliant names