diff options
author | Gregory P. Smith <greg@krypto.org> | 2013-03-20 20:53:21 -0700 |
---|---|---|
committer | Gregory P. Smith <greg@krypto.org> | 2013-03-20 20:53:21 -0700 |
commit | f72119d10f3443972d06c908dc9e85024007649c (patch) | |
tree | 90648bc40ce80b99ee329d9d9abdd02144838fb4 /Lib/threading.py | |
parent | 40a2160a096edbf6f85756dca9522ba83dd893d9 (diff) | |
parent | 3030728138593557fee3a8e2e1ccb2375f8d649c (diff) | |
download | cpython-git-f72119d10f3443972d06c908dc9e85024007649c.tar.gz |
merge heads
Diffstat (limited to 'Lib/threading.py')
-rw-r--r-- | Lib/threading.py | 3 |
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 |