summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBrett Cannon <brett@python.org>2012-07-13 15:26:19 (GMT)
committerBrett Cannon <brett@python.org>2012-07-13 15:26:19 (GMT)
commitd104eef118bda30725ac087e06252a5a3525e2df (patch)
tree25991dac89fdb9f93051c91d4cb711d2cb28067a /Doc
parentc65ef9bf556bc5be2517e2275c98504fcc4678ea (diff)
downloadcpython-d104eef118bda30725ac087e06252a5a3525e2df.zip
cpython-d104eef118bda30725ac087e06252a5a3525e2df.tar.gz
cpython-d104eef118bda30725ac087e06252a5a3525e2df.tar.bz2
Issue #15053: Make sure all functions related to the import lock have
the Python 3.3 change notice on them in case someone directly links to the function(s).
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/imp.rst21
1 files changed, 16 insertions, 5 deletions
diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 43d740b..5cadda9 100644
--- a/Doc/library/imp.rst
+++ b/Doc/library/imp.rst
@@ -224,11 +224,6 @@ locking mechanism. Locking semantics of imports are an implementation
detail which may vary from release to release. However, Python ensures
that circular imports work without any deadlocks.
-.. versionchanged:: 3.3
- In Python 3.3, the locking scheme has changed to per-module locks for
- the most part. A global import lock is kept for some critical tasks,
- such as initializing the per-module locks.
-
.. function:: lock_held()
@@ -243,6 +238,12 @@ that circular imports work without any deadlocks.
exception is made for circular imports, which by construction have to
expose an incomplete module object at some point.
+.. versionchanged:: 3.3
+ The locking scheme has changed to per-module locks for
+ the most part. A global import lock is kept for some critical tasks,
+ such as initializing the per-module locks.
+
+
.. function:: acquire_lock()
Acquire the interpreter's global import lock for the current thread.
@@ -255,12 +256,22 @@ that circular imports work without any deadlocks.
On platforms without threads, this function does nothing.
+.. versionchanged:: 3.3
+ The locking scheme has changed to per-module locks for
+ the most part. A global import lock is kept for some critical tasks,
+ such as initializing the per-module locks.
+
.. function:: release_lock()
Release the interpreter's global import lock. On platforms without
threads, this function does nothing.
+.. versionchanged:: 3.3
+ The locking scheme has changed to per-module locks for
+ the most part. A global import lock is kept for some critical tasks,
+ such as initializing the per-module locks.
+
The following constants with integer values, defined in this module, are used
to indicate the search result of :func:`find_module`.