Merged upstream changes.

This commit is contained in:
Vinay Sajip 2013-03-23 11:01:36 +00:00
commit 42fb352a98

View file

@ -665,6 +665,8 @@ with sub-interpreters:
knowing that the GIL is locked can allow the caller to perform sensitive knowing that the GIL is locked can allow the caller to perform sensitive
actions or otherwise behave differently. actions or otherwise behave differently.
.. versionadded:: 3.4
The following macros are normally used without a trailing semicolon; look for The following macros are normally used without a trailing semicolon; look for
example usage in the Python source distribution. example usage in the Python source distribution.