changeset: 78077:c09f454af2c6 user: Brett Cannon date: Fri Jul 13 11:26:19 2012 -0400 files: Doc/library/imp.rst Misc/NEWS description: 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). diff -r 677a9326b4d4 -r c09f454af2c6 Doc/library/imp.rst --- a/Doc/library/imp.rst Mon Jul 09 18:16:11 2012 -0700 +++ b/Doc/library/imp.rst Fri Jul 13 11:26:19 2012 -0400 @@ -224,11 +224,6 @@ 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 @@ 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 @@ 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`. diff -r 677a9326b4d4 -r c09f454af2c6 Misc/NEWS --- a/Misc/NEWS Mon Jul 09 18:16:11 2012 -0700 +++ b/Misc/NEWS Fri Jul 13 11:26:19 2012 -0400 @@ -110,6 +110,9 @@ Documentation ------------- +- Issue #15053: Copy Python 3.3 import lock change notice to all relevant + functions in imp instead of just at the top of the relevant section. + - Issue #15288: Link to the term "loader" in notes in pkgutil about how things won't work as expected in Python 3.3 and mark the requisite functions as "changed" since they will no longer work with modules directly imported by