diff options
author | Tim Peters <tim.peters@gmail.com> | 2006-06-04 23:52:47 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2006-06-04 23:52:47 (GMT) |
commit | 28eeefe566d77cd3af3d675c4f2216c5033fe538 (patch) | |
tree | 7fec63fcf38c5dbe611860fb74e8c49206d2e581 /Lib/threading.py | |
parent | c7d14452a4ed303d38498cc16c3cfc0beed9b843 (diff) | |
download | cpython-28eeefe566d77cd3af3d675c4f2216c5033fe538.zip cpython-28eeefe566d77cd3af3d675c4f2216c5033fe538.tar.gz cpython-28eeefe566d77cd3af3d675c4f2216c5033fe538.tar.bz2 |
Revert revisions:
46640 Patch #1454481: Make thread stack size runtime tunable.
46647 Markup fix
The first is causing many buildbots to fail test runs, and there
are multiple causes with seemingly no immediate prospects for
repairing them. See python-dev discussion.
Note that a branch can (and should) be created for resolving these
problems, like
svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH
followed by merging rev 46647 to the new branch.
Diffstat (limited to 'Lib/threading.py')
-rw-r--r-- | Lib/threading.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Lib/threading.py b/Lib/threading.py index 5655dde..c27140d 100644 --- a/Lib/threading.py +++ b/Lib/threading.py @@ -15,7 +15,7 @@ from collections import deque # Rename some stuff so "from threading import *" is safe __all__ = ['activeCount', 'Condition', 'currentThread', 'enumerate', 'Event', 'Lock', 'RLock', 'Semaphore', 'BoundedSemaphore', 'Thread', - 'Timer', 'setprofile', 'settrace', 'local', 'stack_size'] + 'Timer', 'setprofile', 'settrace', 'local'] _start_new_thread = thread.start_new_thread _allocate_lock = thread.allocate_lock @@ -713,8 +713,6 @@ def enumerate(): _active_limbo_lock.release() return active -from thread import stack_size - # Create the main thread object _MainThread() |