summaryrefslogtreecommitdiffstats
path: root/Doc/library
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2008-02-25 20:20:45 (GMT)
committerGeorg Brandl <georg@python.org>2008-02-25 20:20:45 (GMT)
commitfd429063e16739b152441d49371298a9b0341cb9 (patch)
tree56b1fb1207a1efb61d3060b22c6a9aabb4f29127 /Doc/library
parent976a0590bb6f82f153cd9fea5832f0f83a8fbe5c (diff)
downloadcpython-fd429063e16739b152441d49371298a9b0341cb9.zip
cpython-fd429063e16739b152441d49371298a9b0341cb9.tar.gz
cpython-fd429063e16739b152441d49371298a9b0341cb9.tar.bz2
Revert r61029.
Diffstat (limited to 'Doc/library')
-rw-r--r--Doc/library/thread.rst6
-rw-r--r--Doc/library/threading.rst7
2 files changed, 1 insertions, 12 deletions
diff --git a/Doc/library/thread.rst b/Doc/library/thread.rst
index 968ebf1..b0e55ea 100644
--- a/Doc/library/thread.rst
+++ b/Doc/library/thread.rst
@@ -150,11 +150,6 @@ In addition to these methods, lock objects can also be used via the
exception will be received by an arbitrary thread. (When the :mod:`signal`
module is available, interrupts always go to the main thread.)
-* The import machinery is not thread safe. In general, an import may not
- have the side effect of importing a module, and only the main thread
- should import modules. Imports within or caused by a thread other than
- the main thread isn't safe.
-
* Calling :func:`sys.exit` or raising the :exc:`SystemExit` exception is
equivalent to calling :func:`exit`.
@@ -175,3 +170,4 @@ In addition to these methods, lock objects can also be used via the
* When the main thread exits, it does not do any of its usual cleanup (except
that :keyword:`try` ... :keyword:`finally` clauses are honored), and the
standard I/O files are not flushed.
+
diff --git a/Doc/library/threading.rst b/Doc/library/threading.rst
index 73ede7b..077ae01 100644
--- a/Doc/library/threading.rst
+++ b/Doc/library/threading.rst
@@ -562,13 +562,6 @@ the :meth:`setDaemon` method and retrieved with the :meth:`isDaemon` method.
There is a "main thread" object; this corresponds to the initial thread of
control in the Python program. It is not a daemon thread.
-.. warning::
-
- The import machinery is not thread safe. In general, an import may not
- have the side effect of importing a module, and only the main thread
- should import modules. Imports within or caused by a thread other than
- the main thread isn't safe.
-
There is the possibility that "dummy thread objects" are created. These are
thread objects corresponding to "alien threads", which are threads of control
started outside the threading module, such as directly from C code. Dummy