merge with 3.3

This commit is contained in:
Georg Brandl 2013-10-06 10:51:07 +02:00
commit 38552a6661

View file

@ -198,7 +198,9 @@ argument values::
>>> >>>
There are, however, enough ways to crash Python with :mod:`ctypes`, so you There are, however, enough ways to crash Python with :mod:`ctypes`, so you
should be careful anyway. should be careful anyway. The :mod:`faulthandler` module can be helpful in
debugging crashes (e.g. from segmentation faults produced by erroneous C library
calls).
``None``, integers, bytes objects and (unicode) strings are the only native ``None``, integers, bytes objects and (unicode) strings are the only native
Python objects that can directly be used as parameters in these function calls. Python objects that can directly be used as parameters in these function calls.