Mailman 3 September 2013 - Python-checkins

peps: Remove pause/resume_writing() and discard_output(). Mention asyncio name.
by guido.van.rossum 30 Sep '13

30 Sep '13

http://hg.python.org/peps/rev/914f0444ef6d changeset: 5157:914f0444ef6d user: Guido van Rossum <guido(a)dropbox.com> date: Mon Sep 30 16:15:24 2013 -0700 summary: Remove pause/resume_writing() and discard_output(). Mention asyncio name. Clarify callback serialization. files: pep-3156.txt | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pep-3156.txt b/pep-3156.txt --- a/pep-3156.txt +++ b/pep-3156.txt @@ -1,5 +1,5 @@ PEP: 3156 -Title: Asynchronous IO Support Rebooted +Title: Asynchronous IO Support Rebooted: the "asyncio" Module Version: $Revision$ Last-Modified: $Date$ Author: Guido van Rossum <guido(a)python.org> @@ -21,6 +21,9 @@ implementation is in the works under the code name Tulip. The Tulip repo is linked from the References section at the end. +The proposed standard library module name is ``asyncio``, although the +rest of this PEP has not yet been updated to reflect this. + Introduction ============ @@ -363,7 +366,9 @@ called as soon as possible. Returns a Handle representing the callback, whose ``cancel()`` method can be used to cancel the callback. It guarantees that callbacks are called in the order in - which they were scheduled. + which they were scheduled. Callbacks associated with the same event + loop are strictly serialized -- one callback must exit before the + next one will be called. - ``call_later(delay, callback, *args)``. Arrange for ``callback(*args)`` to be called approximately ``delay`` seconds in @@ -1024,16 +1029,6 @@ - ``resume()``. Restart delivery of data to the protocol via ``data_received()``. -- ``pause_writing()``. Suspend sending data to the network until a - subsequent ``resume_writing()`` call. Between ``pause_writing()`` - and ``resume_writing()`` the transport's ``write()`` method will - just be accumulating data in an internal buffer. - -- ``resume_writing()``. Restart sending data to the network. - -- ``discard_output()``. Discard all data buffered by ``write()`` but - not yet sent to the network. - - ``close()``. Sever the connection with the entity at the other end. Any data buffered by ``write()`` will (eventually) be transferred before the connection is actually closed. The protocol's -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 2.6 -> 2.7): - Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/36680a7c0e22 changeset: 85898:36680a7c0e22 branch: 2.7 parent: 85896:0f5611bca5a2 parent: 85897:731abf7834c4 user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 19:09:29 2013 -0400 summary: - Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to prevent readline() calls from consuming too much memory. Patch by Jyrki Pulliainen. files: Lib/nntplib.py | 11 ++++- Lib/test/test_nntplib.py | 65 ++++++++++++++++++++++++++++ Misc/NEWS | 4 + 3 files changed, 79 insertions(+), 1 deletions(-) diff --git a/Lib/nntplib.py b/Lib/nntplib.py --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -37,6 +37,13 @@ "error_reply","error_temp","error_perm","error_proto", "error_data",] +# maximal line length when calling readline(). This is to prevent +# reading arbitrary lenght lines. RFC 3977 limits NNTP line length to +# 512 characters, including CRLF. We have selected 2048 just to be on +# the safe side. +_MAXLINE = 2048 + + # Exceptions raised when an error or invalid response is received class NNTPError(Exception): """Base class for all nntplib exceptions""" @@ -200,7 +207,9 @@ def getline(self): """Internal: return one line from the server, stripping CRLF. Raise EOFError if the connection is closed.""" - line = self.file.readline() + line = self.file.readline(_MAXLINE + 1) + if len(line) > _MAXLINE: + raise NNTPDataError('line too long') if self.debugging > 1: print '*get*', repr(line) if not line: raise EOFError diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py new file mode 100644 --- /dev/null +++ b/Lib/test/test_nntplib.py @@ -0,0 +1,65 @@ +import socket +import threading +import nntplib +import time + +from unittest import TestCase +from test import test_support + +HOST = test_support.HOST + + +def server(evt, serv, evil=False): + serv.listen(5) + try: + conn, addr = serv.accept() + except socket.timeout: + pass + else: + if evil: + conn.send("1 I'm too long response" * 3000 + "\n") + else: + conn.send("1 I'm OK response\n") + conn.close() + finally: + serv.close() + evt.set() + + +class BaseServerTest(TestCase): + def setUp(self): + self.evt = threading.Event() + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.settimeout(3) + self.port = test_support.bind_port(self.sock) + threading.Thread( + target=server, + args=(self.evt, self.sock, self.evil)).start() + time.sleep(.1) + + def tearDown(self): + self.evt.wait() + + +class ServerTests(BaseServerTest): + evil = False + + def test_basic_connect(self): + nntp = nntplib.NNTP('localhost', self.port) + nntp.sock.close() + + +class EvilServerTests(BaseServerTest): + evil = True + + def test_too_long_line(self): + self.assertRaises(nntplib.NNTPDataError, + nntplib.NNTP, 'localhost', self.port) + + +def test_main(verbose=None): + test_support.run_unittest(EvilServerTests) + test_support.run_unittest(ServerTests) + +if __name__ == '__main__': + test_main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -32,6 +32,10 @@ Library ------- +- Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to + prevent readline() calls from consuming too much memory. Patch by Jyrki + Pulliainen. + - Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary. Patch by Oscar Benjamin. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.6): - Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/731abf7834c4 changeset: 85897:731abf7834c4 branch: 2.6 parent: 85895:3f09756916ce user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 18:35:15 2013 -0400 summary: - Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to prevent readline() calls from consuming too much memory. Patch by Jyrki Pulliainen. files: Lib/nntplib.py | 11 ++++- Lib/test/test_nntplib.py | 65 ++++++++++++++++++++++++++++ Misc/NEWS | 4 + 3 files changed, 79 insertions(+), 1 deletions(-) diff --git a/Lib/nntplib.py b/Lib/nntplib.py --- a/Lib/nntplib.py +++ b/Lib/nntplib.py @@ -37,6 +37,13 @@ "error_reply","error_temp","error_perm","error_proto", "error_data",] +# maximal line length when calling readline(). This is to prevent +# reading arbitrary lenght lines. RFC 3977 limits NNTP line length to +# 512 characters, including CRLF. We have selected 2048 just to be on +# the safe side. +_MAXLINE = 2048 + + # Exceptions raised when an error or invalid response is received class NNTPError(Exception): """Base class for all nntplib exceptions""" @@ -200,7 +207,9 @@ def getline(self): """Internal: return one line from the server, stripping CRLF. Raise EOFError if the connection is closed.""" - line = self.file.readline() + line = self.file.readline(_MAXLINE + 1) + if len(line) > _MAXLINE: + raise NNTPDataError('line too long') if self.debugging > 1: print '*get*', repr(line) if not line: raise EOFError diff --git a/Lib/test/test_nntplib.py b/Lib/test/test_nntplib.py new file mode 100644 --- /dev/null +++ b/Lib/test/test_nntplib.py @@ -0,0 +1,65 @@ +import socket +import threading +import nntplib +import time + +from unittest import TestCase +from test import test_support + +HOST = test_support.HOST + + +def server(evt, serv, evil=False): + serv.listen(5) + try: + conn, addr = serv.accept() + except socket.timeout: + pass + else: + if evil: + conn.send("1 I'm too long response" * 3000 + "\n") + else: + conn.send("1 I'm OK response\n") + conn.close() + finally: + serv.close() + evt.set() + + +class BaseServerTest(TestCase): + def setUp(self): + self.evt = threading.Event() + self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + self.sock.settimeout(3) + self.port = test_support.bind_port(self.sock) + threading.Thread( + target=server, + args=(self.evt, self.sock, self.evil)).start() + time.sleep(.1) + + def tearDown(self): + self.evt.wait() + + +class ServerTests(BaseServerTest): + evil = False + + def test_basic_connect(self): + nntp = nntplib.NNTP('localhost', self.port) + nntp.sock.close() + + +class EvilServerTests(BaseServerTest): + evil = True + + def test_too_long_line(self): + self.assertRaises(nntplib.NNTPDataError, + nntplib.NNTP, 'localhost', self.port) + + +def test_main(verbose=None): + test_support.run_unittest(EvilServerTests) + test_support.run_unittest(ServerTests) + +if __name__ == '__main__': + test_main() diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -20,6 +20,10 @@ prevent readline() calls from consuming too much memory. Patch by Jyrki Pulliainen. +- Issue #16040: CVE-2013-1752: nntplib: Limit maximum line lengths to 2048 to + prevent readline() calls from consuming too much memory. Patch by Jyrki + Pulliainen. + - Issue #16039: CVE-2013-1752: Change use of readline in imaplib module to limit line length. Patch by Emil Lind. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.6 -> 2.7): null merge
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/0f5611bca5a2 changeset: 85896:0f5611bca5a2 branch: 2.7 parent: 85892:7d9a1aa8d95e parent: 85895:3f09756916ce user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 16:46:25 2013 -0400 summary: null merge files: -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.6): Fix typo in NEWS file.
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/3f09756916ce changeset: 85895:3f09756916ce branch: 2.6 parent: 85889:7214e3324a45 user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 16:45:40 2013 -0400 summary: Fix typo in NEWS file. files: Misc/NEWS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -17,7 +17,7 @@ limiting the call to readline(). Original patch by Christian Heimes. - Issue #16041: CVE-2013-1752: poplib: Limit maximum line lengths to 2048 to - prevent readline() calls from consuming too much member. Patch by Jyrki + prevent readline() calls from consuming too much memory. Patch by Jyrki Pulliainen. - Issue #16039: CVE-2013-1752: Change use of readline in imaplib module to -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.3 -> default): Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when
by antoine.pitrou 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/8e180b2067e4 changeset: 85894:8e180b2067e4 parent: 85888:d329bc30f2d6 parent: 85893:6b89176f1be5 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Sep 30 22:29:48 2013 +0200 summary: Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary. Patch by Oscar Benjamin. files: Lib/distutils/cygwinccompiler.py | 24 ++++++++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -48,13 +48,14 @@ import os import sys import copy -from subprocess import Popen, PIPE +from subprocess import Popen, PIPE, check_output import re from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler from distutils.file_util import write_file -from distutils.errors import DistutilsExecError, CompileError, UnknownFileError +from distutils.errors import (DistutilsExecError, CCompilerError, + CompileError, UnknownFileError) from distutils import log from distutils.version import LooseVersion from distutils.spawn import find_executable @@ -294,11 +295,15 @@ else: entry_point = '' - self.set_executables(compiler='gcc -mno-cygwin -O -Wall', - compiler_so='gcc -mno-cygwin -mdll -O -Wall', - compiler_cxx='g++ -mno-cygwin -O -Wall', - linker_exe='gcc -mno-cygwin', - linker_so='%s -mno-cygwin %s %s' + if is_cygwingcc(): + raise CCompilerError( + 'Cygwin gcc cannot be used with --compiler=mingw32') + + self.set_executables(compiler='gcc -O -Wall', + compiler_so='gcc -mdll -O -Wall', + compiler_cxx='g++ -O -Wall', + linker_exe='gcc', + linker_so='%s %s %s' % (self.linker_dll, shared_option, entry_point)) # Maybe we should also append -mthreads, but then the finished @@ -393,3 +398,8 @@ """ commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version'] return tuple([_find_exe_version(cmd) for cmd in commands]) + +def is_cygwingcc(): + '''Try to determine if the gcc that would be used is from cygwin.''' + out_string = check_output(['gcc', '-dumpmachine']) + return out_string.strip().endswith(b'cygwin') diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -102,6 +102,7 @@ Alexander “Саша” Belopolsky Eli Bendersky David Benjamin +Oscar Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,9 @@ Library ------- +- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except + when necessary. Patch by Oscar Benjamin. + - Issue #5845: In site.py, only load readline history from ~/.python_history if no history has been read already. This avoids double writes to the history file at shutdown. -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.3): Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when
by antoine.pitrou 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/6b89176f1be5 changeset: 85893:6b89176f1be5 branch: 3.3 parent: 85887:c05c71699c38 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Sep 30 22:28:10 2013 +0200 summary: Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary. Patch by Oscar Benjamin. files: Lib/distutils/cygwinccompiler.py | 26 +++++++++++++------ Misc/ACKS | 1 + Misc/NEWS | 3 ++ 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -48,7 +48,7 @@ import os import sys import copy -from subprocess import Popen, PIPE +from subprocess import Popen, PIPE, check_output import re from distutils.ccompiler import gen_preprocess_options, gen_lib_options @@ -294,13 +294,18 @@ else: entry_point = '' - self.set_executables(compiler='gcc -mno-cygwin -O -Wall', - compiler_so='gcc -mno-cygwin -mdll -O -Wall', - compiler_cxx='g++ -mno-cygwin -O -Wall', - linker_exe='gcc -mno-cygwin', - linker_so='%s -mno-cygwin %s %s' - % (self.linker_dll, shared_option, - entry_point)) + if self.gcc_version < '4' or is_cygwingcc(): + no_cygwin = ' -mno-cygwin' + else: + no_cygwin = '' + + self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, + compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, + compiler_cxx='g++%s -O -Wall' % no_cygwin, + linker_exe='gcc%s' % no_cygwin, + linker_so='%s%s %s %s' + % (self.linker_dll, no_cygwin, + shared_option, entry_point)) # Maybe we should also append -mthreads, but then the finished # dlls need another dll (mingwm10.dll see Mingw32 docs) # (-mthreads: Support thread-safe exception handling on `Mingw32') @@ -393,3 +398,8 @@ """ commands = ['gcc -dumpversion', 'ld -v', 'dllwrap --version'] return tuple([_find_exe_version(cmd) for cmd in commands]) + +def is_cygwingcc(): + '''Try to determine if the gcc that would be used is from cygwin.''' + out_string = check_output(['gcc', '-dumpmachine']) + return out_string.strip().endswith(b'cygwin') diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -101,6 +101,7 @@ Alexander “Саша” Belopolsky Eli Bendersky David Benjamin +Oscar Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -71,6 +71,9 @@ Library ------- +- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except + when necessary. Patch by Oscar Benjamin. + - Properly initialize all fields of a SSL object after allocation. - Issue #4366: Fix building extensions on all platforms when --enable-shared -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when
by antoine.pitrou 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/7d9a1aa8d95e changeset: 85892:7d9a1aa8d95e branch: 2.7 user: Antoine Pitrou <solipsis(a)pitrou.net> date: Mon Sep 30 22:13:17 2013 +0200 summary: Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except when necessary. Patch by Oscar Benjamin. files: Lib/distutils/cygwinccompiler.py | 28 +++++++++++++++----- Misc/ACKS | 1 + Misc/NEWS | 3 ++ 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -319,13 +319,18 @@ else: entry_point = '' - self.set_executables(compiler='gcc -mno-cygwin -O -Wall', - compiler_so='gcc -mno-cygwin -mdll -O -Wall', - compiler_cxx='g++ -mno-cygwin -O -Wall', - linker_exe='gcc -mno-cygwin', - linker_so='%s -mno-cygwin %s %s' - % (self.linker_dll, shared_option, - entry_point)) + if self.gcc_version < '4' or is_cygwingcc(): + no_cygwin = ' -mno-cygwin' + else: + no_cygwin = '' + + self.set_executables(compiler='gcc%s -O -Wall' % no_cygwin, + compiler_so='gcc%s -mdll -O -Wall' % no_cygwin, + compiler_cxx='g++%s -O -Wall' % no_cygwin, + linker_exe='gcc%s' % no_cygwin, + linker_so='%s%s %s %s' + % (self.linker_dll, no_cygwin, + shared_option, entry_point)) # Maybe we should also append -mthreads, but then the finished # dlls need another dll (mingwm10.dll see Mingw32 docs) # (-mthreads: Support thread-safe exception handling on `Mingw32') @@ -447,3 +452,12 @@ else: dllwrap_version = None return (gcc_version, ld_version, dllwrap_version) + +def is_cygwingcc(): + '''Try to determine if the gcc that would be used is from cygwin.''' + out = os.popen('gcc -dumpmachine', 'r') + out_string = out.read() + out.close() + # out_string is the target triplet cpu-vendor-os + # Cygwin's gcc sets the os to 'cygwin' + return out_string.strip().endswith('cygwin') diff --git a/Misc/ACKS b/Misc/ACKS --- a/Misc/ACKS +++ b/Misc/ACKS @@ -84,6 +84,7 @@ Thomas Bellman Alexander “Саша” Belopolsky David Benjamin +Oscar Benjamin Andrew Bennetts Andy Bensky Bennett Benson diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -32,6 +32,9 @@ Library ------- +- Issue #12641: Avoid passing "-mno-cygwin" to the mingw32 compiler, except + when necessary. Patch by Oscar Benjamin. + - Properly initialize all fields of a SSL object after allocation. - Issue #4366: Fix building extensions on all platforms when --enable-shared -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.7 -> 2.7): merge heads
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/4979f6bd3ae7 changeset: 85891:4979f6bd3ae7 branch: 2.7 parent: 85890:39dbcc92b6c0 parent: 85886:cedd1c94c534 user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 15:58:28 2013 -0400 summary: merge heads files: Doc/c-api/init.rst | 55 ++++++++++++++++++--------------- 1 files changed, 30 insertions(+), 25 deletions(-) diff --git a/Doc/c-api/init.rst b/Doc/c-api/init.rst --- a/Doc/c-api/init.rst +++ b/Doc/c-api/init.rst @@ -427,6 +427,9 @@ standard :mod:`zlib` and :mod:`hashlib` modules release the GIL when compressing or hashing data. + +.. _gilstate: + Non-Python created threads -------------------------- @@ -905,43 +908,45 @@ A mechanism is provided to make asynchronous notifications to the main interpreter thread. These notifications take the form of a function -pointer and a void argument. +pointer and a void pointer argument. -.. index:: single: setcheckinterval() (in module sys) - -Every check interval, when the global interpreter lock is released and -reacquired, Python will also call any such provided functions. This can be used -for example by asynchronous IO handlers. The notification can be scheduled from -a worker thread and the actual call than made at the earliest convenience by the -main thread where it has possession of the global interpreter lock and can -perform any Python API calls. .. c:function:: int Py_AddPendingCall(int (*func)(void *), void *arg) .. index:: single: Py_AddPendingCall() - Post a notification to the Python main thread. If successful, *func* will be - called with the argument *arg* at the earliest convenience. *func* will be - called having the global interpreter lock held and can thus use the full - Python API and can take any action such as setting object attributes to - signal IO completion. It must return 0 on success, or -1 signalling an - exception. The notification function won't be interrupted to perform another - asynchronous notification recursively, but it can still be interrupted to - switch threads if the global interpreter lock is released, for example, if it - calls back into Python code. + Schedule a function to be called from the main interpreter thread. On + success, 0 is returned and *func* is queued for being called in the + main thread. On failure, -1 is returned without setting any exception. - This function returns 0 on success in which case the notification has been - scheduled. Otherwise, for example if the notification buffer is full, it - returns -1 without setting any exception. + When successfully queued, *func* will be *eventually* called from the + main interpreter thread with the argument *arg*. It will be called + asynchronously with respect to normally running Python code, but with + both these conditions met: - This function can be called on any thread, be it a Python thread or some - other system thread. If it is a Python thread, it doesn't matter if it holds - the global interpreter lock or not. + * on a :term:`bytecode` boundary; + * with the main thread holding the :term:`global interpreter lock` + (*func* can therefore use the full C API). + + *func* must return 0 on success, or -1 on failure with an exception + set. *func* won't be interrupted to perform another asynchronous + notification recursively, but it can still be interrupted to switch + threads if the global interpreter lock is released. + + This function doesn't need a current thread state to run, and it doesn't + need the global interpreter lock. + + .. warning:: + This is a low-level function, only useful for very special cases. + There is no guarantee that *func* will be called as quick as + possible. If the main thread is busy executing a system call, + *func* won't be called before the system call returns. This + function is generally **not** suitable for calling Python code from + arbitrary C threads. Instead, use the :ref:`PyGILState API<gilstate>`. .. versionadded:: 2.7 - .. _profiling: Profiling and Tracing -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 2.6 -> 2.7): null merge
by barry.warsaw 30 Sep '13

30 Sep '13

http://hg.python.org/cpython/rev/39dbcc92b6c0 changeset: 85890:39dbcc92b6c0 branch: 2.7 parent: 85882:c1a294bbb4fa parent: 85889:7214e3324a45 user: Barry Warsaw <barry(a)python.org> date: Mon Sep 30 15:57:29 2013 -0400 summary: null merge files: -- Repository URL: http://hg.python.org/cpython

1 0