diff options
author | Benjamin Peterson <benjamin@python.org> | 2010-09-13 01:52:40 (GMT) |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2010-09-13 01:52:40 (GMT) |
commit | ee258571b5a4163df9f65070b78aaaa6e72bf084 (patch) | |
tree | bdce44e778f3ca1cdea43bc31721d5f82fbc9d23 /Doc | |
parent | 167c3bc3c1b0ea9bff7b9d0993632e4fed983964 (diff) | |
download | cpython-ee258571b5a4163df9f65070b78aaaa6e72bf084.zip cpython-ee258571b5a4163df9f65070b78aaaa6e72bf084.tar.gz cpython-ee258571b5a4163df9f65070b78aaaa6e72bf084.tar.bz2 |
Merged revisions 84754-84755 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84754 | benjamin.peterson | 2010-09-12 20:25:38 -0500 (Sun, 12 Sep 2010) | 1 line
remove duplicate statement
........
r84755 | benjamin.peterson | 2010-09-12 20:30:04 -0500 (Sun, 12 Sep 2010) | 1 line
remove less complete of duplicate docs
........
Diffstat (limited to 'Doc')
-rw-r--r-- | Doc/library/imp.rst | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst index 68cda84..b6123ae 100644 --- a/Doc/library/imp.rst +++ b/Doc/library/imp.rst @@ -113,8 +113,7 @@ This module provides an interface to the mechanisms used to implement the .. function:: acquire_lock() Acquire the interpreter's import lock for the current thread. This lock should - be used by import hooks to ensure thread-safety when importing modules. On - platforms without threads, this function does nothing. + be used by import hooks to ensure thread-safety when importing modules. Once a thread has acquired the import lock, the same thread may acquire it again without blocking; the thread must release it once for each time it has @@ -191,19 +190,6 @@ This module provides an interface to the mechanisms used to implement the continue to use the old class definition. The same is true for derived classes. -.. function:: acquire_lock() - - Acquires the interpreter's import lock for the current thread. This lock should - be used by import hooks to ensure thread-safety when importing modules. On - platforms without threads, this function does nothing. - - -.. function:: release_lock() - - Release the interpreter's import lock. On platforms without threads, this - function does nothing. - - The following constants with integer values, defined in this module, are used to indicate the search result of :func:`find_module`. |