From: Martin Panter Date: Sat, 10 Oct 2015 10:44:25 +0000 (+0000) Subject: Issue #25161: Merge full stops from 3.4 into 3.5 X-Git-Tag: v3.5.1rc1~186 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=84835ab1cb2a8ccfeeb4474d39130d972a3c563d;p=thirdparty%2FPython%2Fcpython.git Issue #25161: Merge full stops from 3.4 into 3.5 --- 84835ab1cb2a8ccfeeb4474d39130d972a3c563d diff --cc Doc/c-api/gen.rst index 3ab073b1914b,0c851a75efbe..1efbae4fcba0 --- a/Doc/c-api/gen.rst +++ b/Doc/c-api/gen.rst @@@ -17,10 -17,10 +17,10 @@@ than explicitly calling :c:func:`PyGen_ .. c:var:: PyTypeObject PyGen_Type - The type object corresponding to generator objects + The type object corresponding to generator objects. -.. c:function:: int PyGen_Check(ob) +.. c:function:: int PyGen_Check(PyObject *ob) Return true if *ob* is a generator object; *ob* must not be *NULL*. diff --cc Doc/library/json.rst index 49bb0905e01d,a01e63649608..d62f14be60e3 --- a/Doc/library/json.rst +++ b/Doc/library/json.rst @@@ -339,11 -337,8 +339,11 @@@ Encoders and Decoder .. method:: decode(s) Return the Python representation of *s* (a :class:`str` instance - containing a JSON document) + containing a JSON document). + :exc:`JSONDecodeError` will be raised if the given JSON document is not + valid. + .. method:: raw_decode(s) Decode a JSON document from *s* (a :class:`str` beginning with a diff --cc Misc/ACKS index 3d257cd16e3f,d0ba52f1937a..120956ee231d --- a/Misc/ACKS +++ b/Misc/ACKS @@@ -1403,9 -1365,9 +1403,10 @@@ Thenault Sylvai Péter Szabó John Szakmeister Amir Szekely +Maciej Szulik Arfrever Frehtes Taifersar Arahesis Hideaki Takahashi + Takase Arihiro Indra Talip Neil Tallim Geoff Talvola