[Python-checkins] r84757 - in python/branches/release27-maint: Doc/library/imp.rst

[benjamin.peterson]

Author: benjamin.peterson
Date: Mon Sep 13 03:48:02 2010
New Revision: 84757

Log:
Merged revisions 84754 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
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Doc/library/imp.rst

Modified: python/branches/release27-maint/Doc/library/imp.rst
==============================================================================
--- python/branches/release27-maint/Doc/library/imp.rst	(original)
+++ python/branches/release27-maint/Doc/library/imp.rst	Mon Sep 13 03:48:02 2010
@@ -116,8 +116,7 @@
 .. 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