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
........

diff --git a/Doc/library/imp.rst b/Doc/library/imp.rst
index 68cda84bf5cb346384e8e71939e5c9c2b23a1bce..b6123ae6281eab380446ab09e47488f88909f702 100644 (file)
--- 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`.