Skip to content

make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c #987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 15, 2019
Merged

make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7791a63
make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c
Seluj78 Nov 15, 2019
a0786fe
Fixed silly fuzzies for CI
Seluj78 Nov 15, 2019
3e637bf
More make merge from my PRs
Seluj78 Nov 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 37 additions & 29 deletions c-api/arg.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
"Last-Translator: Julien Palard <julien@palard.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -114,7 +114,7 @@ msgstr "Sauf indication contraire, les tampons ne se terminent pas par NUL."
msgid ""
"Some formats require a read-only :term:`bytes-like object`, and set a "
"pointer instead of a buffer structure. They work by checking that the "
"object's :c:member:`PyBufferProcs.bf_releasebuffer` field is *NULL*, which "
"object's :c:member:`PyBufferProcs.bf_releasebuffer` field is ``NULL``, which "
"disallows mutable objects such as :class:`bytearray`."
msgstr ""

Expand Down Expand Up @@ -196,9 +196,10 @@ msgid "``z`` (:class:`str` or ``None``) [const char \\*]"
msgstr "``z`` (:class:`str` ou ``None``) [``const char *``]"

#: ../Doc/c-api/arg.rst:101
#, fuzzy
msgid ""
"Like ``s``, but the Python object may also be ``None``, in which case the C "
"pointer is set to *NULL*."
"pointer is set to ``NULL``."
msgstr ""
"Comme ``s``, mais l'objet Python peut aussi être ``None``, auquel cas le "
"pointeur C devient *NULL*."
Expand All @@ -210,10 +211,13 @@ msgstr ""
"``z*`` (:class:`str`, :term:`bytes-like object` ou ``None``) [``Py_buffer``]"

#: ../Doc/c-api/arg.rst:105
#, fuzzy
msgid ""
"Like ``s*``, but the Python object may also be ``None``, in which case the "
"``buf`` member of the :c:type:`Py_buffer` structure is set to *NULL*."
"``buf`` member of the :c:type:`Py_buffer` structure is set to ``NULL``."
msgstr ""
"Comme ``u``, mais l'objet Python peut aussi être ``None``, auquel cas le "
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."

#: ../Doc/c-api/arg.rst:110
msgid ""
Expand All @@ -222,9 +226,10 @@ msgid ""
msgstr ""

#: ../Doc/c-api/arg.rst:109
#, fuzzy
msgid ""
"Like ``s#``, but the Python object may also be ``None``, in which case the C "
"pointer is set to *NULL*."
"pointer is set to ``NULL``."
msgstr ""
"Comme ``s#``, mais l'objet Python peut également être ``None``, dans ce cas "
"le pointeur C est définie à *NULL*."
Expand Down Expand Up @@ -330,9 +335,10 @@ msgid "``Z`` (:class:`str` or ``None``) [const Py_UNICODE \\*]"
msgstr "``Z`` (:class:`str` ou ``None``) [``const Py_UNICODE *``]"

#: ../Doc/c-api/arg.rst:168
#, fuzzy
msgid ""
"Like ``u``, but the Python object may also be ``None``, in which case the :c:"
"type:`Py_UNICODE` pointer is set to *NULL*."
"type:`Py_UNICODE` pointer is set to ``NULL``."
msgstr ""
"Comme ``u``, mais l'objet Python peut aussi être ``None``, auquel cas le "
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."
Expand All @@ -342,9 +348,10 @@ msgid "``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int]"
msgstr "``Z#`` (:class:`str` ou ``None``) [``const Py_UNICODE *``, ``int``]"

#: ../Doc/c-api/arg.rst:176
#, fuzzy
msgid ""
"Like ``u#``, but the Python object may also be ``None``, in which case the :"
"c:type:`Py_UNICODE` pointer is set to *NULL*."
"c:type:`Py_UNICODE` pointer is set to ``NULL``."
msgstr ""
"Comme ``u#``, mais l'objet Python peut également être ``None``, auquel cas "
"le pointeur :c:type:`Py_UNICODE` vaut *NULL*."
Expand Down Expand Up @@ -386,7 +393,7 @@ msgstr ""
msgid ""
"This format requires two arguments. The first is only used as input, and "
"must be a :c:type:`const char\\*` which points to the name of an encoding as "
"a NUL-terminated string, or *NULL*, in which case ``'utf-8'`` encoding is "
"a NUL-terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is "
"used. An exception is raised if the named encoding is not known to Python. "
"The second argument must be a :c:type:`char\\*\\*`; the value of the pointer "
"it references will be set to a buffer with the contents of the argument "
Expand Down Expand Up @@ -432,8 +439,8 @@ msgstr ""
msgid ""
"It requires three arguments. The first is only used as input, and must be "
"a :c:type:`const char\\*` which points to the name of an encoding as a NUL-"
"terminated string, or *NULL*, in which case ``'utf-8'`` encoding is used. An "
"exception is raised if the named encoding is not known to Python. The "
"terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is used. "
"An exception is raised if the named encoding is not known to Python. The "
"second argument must be a :c:type:`char\\*\\*`; the value of the pointer it "
"references will be set to a buffer with the contents of the argument text. "
"The text will be encoded in the encoding specified by the first argument. "
Expand All @@ -447,16 +454,16 @@ msgstr "Il existe deux modes de fonctionnement :"

#: ../Doc/c-api/arg.rst:233
msgid ""
"If *\\*buffer* points a *NULL* pointer, the function will allocate a buffer "
"of the needed size, copy the encoded data into this buffer and set *"
"If *\\*buffer* points a ``NULL`` pointer, the function will allocate a "
"buffer of the needed size, copy the encoded data into this buffer and set *"
"\\*buffer* to reference the newly allocated storage. The caller is "
"responsible for calling :c:func:`PyMem_Free` to free the allocated buffer "
"after usage."
msgstr ""

#: ../Doc/c-api/arg.rst:238
msgid ""
"If *\\*buffer* points to a non-*NULL* pointer (an already allocated "
"If *\\*buffer* points to a non-``NULL`` pointer (an already allocated "
"buffer), :c:func:`PyArg_ParseTuple` will use this location as the buffer and "
"interpret the initial value of *\\*buffer_length* as the buffer size. It "
"will then copy the encoded data into the buffer and NUL-terminate it. If "
Expand Down Expand Up @@ -661,10 +668,11 @@ msgid "``O`` (object) [PyObject \\*]"
msgstr "``O`` (objet) [``PyObject *``]"

#: ../Doc/c-api/arg.rst:318
#, fuzzy
msgid ""
"Store a Python object (without any conversion) in a C object pointer. The C "
"program thus receives the actual object that was passed. The object's "
"reference count is not increased. The pointer stored is not *NULL*."
"reference count is not increased. The pointer stored is not ``NULL``."
msgstr ""
"Stocke un objet Python (sans aucune conversion) en un pointeur sur un objet "
"C. Ainsi, Le programme C reçoit l'objet réel qui a été passé. Le compteur de "
Expand Down Expand Up @@ -711,7 +719,7 @@ msgid ""
"If the *converter* returns ``Py_CLEANUP_SUPPORTED``, it may get called a "
"second time if the argument parsing eventually fails, giving the converter a "
"chance to release any memory that it had already allocated. In this second "
"call, the *object* parameter will be NULL; *address* will have the same "
"call, the *object* parameter will be ``NULL``; *address* will have the same "
"value as in the original call."
msgstr ""

Expand Down Expand Up @@ -871,7 +879,7 @@ msgstr ""
#: ../Doc/c-api/arg.rst:438
msgid ""
"Parse the parameters of a function that takes both positional and keyword "
"parameters into local variables. The *keywords* argument is a *NULL*-"
"parameters into local variables. The *keywords* argument is a ``NULL``-"
"terminated array of keyword parameter names. Empty names denote :ref:"
"`positional-only parameters <positional-only_parameter>`. Returns true on "
"success; on failure, it returns false and raises the appropriate exception."
Expand Down Expand Up @@ -945,8 +953,8 @@ msgstr "Construction des valeurs"
msgid ""
"Create a new value based on a format string similar to those accepted by "
"the :c:func:`PyArg_Parse\\*` family of functions and a sequence of values. "
"Returns the value or *NULL* in the case of an error; an exception will be "
"raised if *NULL* is returned."
"Returns the value or ``NULL`` in the case of an error; an exception will be "
"raised if ``NULL`` is returned."
msgstr ""

#: ../Doc/c-api/arg.rst:526
Expand Down Expand Up @@ -991,7 +999,7 @@ msgstr "``s`` (:class:`str` ou ``None``) [``const char *``]"
#: ../Doc/c-api/arg.rst:549
msgid ""
"Convert a null-terminated C string to a Python :class:`str` object using "
"``'utf-8'`` encoding. If the C string pointer is *NULL*, ``None`` is used."
"``'utf-8'`` encoding. If the C string pointer is ``NULL``, ``None`` is used."
msgstr ""

#: ../Doc/c-api/arg.rst:555
Expand All @@ -1001,7 +1009,7 @@ msgstr "``s#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
#: ../Doc/c-api/arg.rst:553
msgid ""
"Convert a C string and its length to a Python :class:`str` object using "
"``'utf-8'`` encoding. If the C string pointer is *NULL*, the length is "
"``'utf-8'`` encoding. If the C string pointer is ``NULL``, the length is "
"ignored and ``None`` is returned."
msgstr ""

Expand All @@ -1012,7 +1020,7 @@ msgstr "``y`` (:class:`bytes`) [``const char *``]"
#: ../Doc/c-api/arg.rst:558
msgid ""
"This converts a C string to a Python :class:`bytes` object. If the C string "
"pointer is *NULL*, ``None`` is returned."
"pointer is ``NULL``, ``None`` is returned."
msgstr ""

#: ../Doc/c-api/arg.rst:563
Expand All @@ -1022,7 +1030,7 @@ msgstr "``y#`` (:class:`bytes`) [``const char *, int``]"
#: ../Doc/c-api/arg.rst:562
msgid ""
"This converts a C string and its lengths to a Python object. If the C "
"string pointer is *NULL*, ``None`` is returned."
"string pointer is ``NULL``, ``None`` is returned."
msgstr ""

#: ../Doc/c-api/arg.rst:566 ../Doc/c-api/arg.rst:582
Expand All @@ -1045,7 +1053,7 @@ msgstr "``u`` (:class:`str`) [``const wchar_t *``]"
msgid ""
"Convert a null-terminated :c:type:`wchar_t` buffer of Unicode (UTF-16 or "
"UCS-4) data to a Python Unicode object. If the Unicode buffer pointer is "
"*NULL*, ``None`` is returned."
"``NULL``, ``None`` is returned."
msgstr ""

#: ../Doc/c-api/arg.rst:579
Expand All @@ -1055,7 +1063,7 @@ msgstr "``u#`` (:class:`str`) [``const wchar_t *``, ``int``]"
#: ../Doc/c-api/arg.rst:577
msgid ""
"Convert a Unicode (UTF-16 or UCS-4) data buffer and its length to a Python "
"Unicode object. If the Unicode buffer pointer is *NULL*, the length is "
"Unicode object. If the Unicode buffer pointer is ``NULL``, the length is "
"ignored and ``None`` is returned."
msgstr ""

Expand Down Expand Up @@ -1150,11 +1158,11 @@ msgstr ""
#: ../Doc/c-api/arg.rst:638
msgid ""
"Pass a Python object untouched (except for its reference count, which is "
"incremented by one). If the object passed in is a *NULL* pointer, it is "
"incremented by one). If the object passed in is a ``NULL`` pointer, it is "
"assumed that this was caused because the call producing the argument found "
"an error and set an exception. Therefore, :c:func:`Py_BuildValue` will "
"return *NULL* but won't raise an exception. If no exception has been raised "
"yet, :exc:`SystemError` is set."
"return ``NULL`` but won't raise an exception. If no exception has been "
"raised yet, :exc:`SystemError` is set."
msgstr ""

#: ../Doc/c-api/arg.rst:646
Expand All @@ -1181,7 +1189,7 @@ msgid ""
"Convert *anything* to a Python object through a *converter* function. The "
"function is called with *anything* (which should be compatible with :c:type:"
"`void \\*`) as its argument and should return a \"new\" Python object, or "
"*NULL* if an error occurred."
"``NULL`` if an error occurred."
msgstr ""

#: ../Doc/c-api/arg.rst:660
Expand Down Expand Up @@ -1214,7 +1222,7 @@ msgstr ""
#: ../Doc/c-api/arg.rst:670
msgid ""
"If there is an error in the format string, the :exc:`SystemError` exception "
"is set and *NULL* returned."
"is set and ``NULL`` returned."
msgstr ""

#: ../Doc/c-api/arg.rst:675
Expand Down
40 changes: 20 additions & 20 deletions c-api/buffer.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.6\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-10-09 17:54+0200\n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"PO-Revision-Date: 2018-10-04 12:18+0200\n"
"Last-Translator: \n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -202,7 +202,7 @@ msgstr ""
#: ../Doc/c-api/buffer.rst:104
msgid ""
"A new reference to the exporting object. The reference is owned by the "
"consumer and automatically decremented and set to *NULL* by :c:func:"
"consumer and automatically decremented and set to ``NULL`` by :c:func:"
"`PyBuffer_Release`. The field is the equivalent of the return value of any "
"standard C-API function."
msgstr ""
Expand All @@ -211,7 +211,7 @@ msgstr ""
msgid ""
"As a special case, for *temporary* buffers that are wrapped by :c:func:"
"`PyMemoryView_FromBuffer` or :c:func:`PyBuffer_FillInfo` this field is "
"*NULL*. In general, exporting objects MUST NOT use this scheme."
"``NULL``. In general, exporting objects MUST NOT use this scheme."
msgstr ""

#: ../Doc/c-api/buffer.rst:116
Expand Down Expand Up @@ -239,15 +239,15 @@ msgstr ""
#: ../Doc/c-api/buffer.rst:132
msgid ""
"Item size in bytes of a single element. Same as the value of :func:`struct."
"calcsize` called on non-NULL :c:member:`~Py_buffer.format` values."
"calcsize` called on non-``NULL`` :c:member:`~Py_buffer.format` values."
msgstr ""

#: ../Doc/c-api/buffer.rst:135
msgid ""
"Important exception: If a consumer requests a buffer without the :c:macro:"
"`PyBUF_FORMAT` flag, :c:member:`~Py_buffer.format` will be set to *NULL*, "
"but :c:member:`~Py_buffer.itemsize` still has the value for the original "
"format."
"`PyBUF_FORMAT` flag, :c:member:`~Py_buffer.format` will be set to "
"``NULL``, but :c:member:`~Py_buffer.itemsize` still has the value for the "
"original format."
msgstr ""

#: ../Doc/c-api/buffer.rst:140
Expand All @@ -259,16 +259,16 @@ msgstr ""

#: ../Doc/c-api/buffer.rst:144
msgid ""
"If :c:member:`~Py_buffer.shape` is *NULL* as a result of a :c:macro:"
"If :c:member:`~Py_buffer.shape` is ``NULL`` as a result of a :c:macro:"
"`PyBUF_SIMPLE` or a :c:macro:`PyBUF_WRITABLE` request, the consumer must "
"disregard :c:member:`~Py_buffer.itemsize` and assume ``itemsize == 1``."
msgstr ""

#: ../Doc/c-api/buffer.rst:150
msgid ""
"A *NUL* terminated string in :mod:`struct` module style syntax describing "
"the contents of a single item. If this is *NULL*, ``\"B\"`` (unsigned bytes) "
"is assumed."
"the contents of a single item. If this is ``NULL``, ``\"B\"`` (unsigned "
"bytes) is assumed."
msgstr ""

#: ../Doc/c-api/buffer.rst:154
Expand All @@ -280,7 +280,7 @@ msgid ""
"The number of dimensions the memory represents as an n-dimensional array. If "
"it is ``0``, :c:member:`~Py_buffer.buf` points to a single item representing "
"a scalar. In this case, :c:member:`~Py_buffer.shape`, :c:member:`~Py_buffer."
"strides` and :c:member:`~Py_buffer.suboffsets` MUST be *NULL*."
"strides` and :c:member:`~Py_buffer.suboffsets` MUST be ``NULL``."
msgstr ""

#: ../Doc/c-api/buffer.rst:163
Expand Down Expand Up @@ -337,7 +337,7 @@ msgstr ""
#: ../Doc/c-api/buffer.rst:201
msgid ""
"If all suboffsets are negative (i.e. no de-referencing is needed), then this "
"field must be NULL (the default value)."
"field must be ``NULL`` (the default value)."
msgstr ""

#: ../Doc/c-api/buffer.rst:204
Expand Down Expand Up @@ -403,7 +403,7 @@ msgstr ""
#: ../Doc/c-api/buffer.rst:250
msgid ""
"Controls the :c:member:`~Py_buffer.format` field. If set, this field MUST be "
"filled in correctly. Otherwise, this field MUST be *NULL*."
"filled in correctly. Otherwise, this field MUST be ``NULL``."
msgstr ""

#: ../Doc/c-api/buffer.rst:254
Expand Down Expand Up @@ -566,12 +566,12 @@ msgid ""
"If ``ndim == 0``, the memory location pointed to by :c:member:`~Py_buffer."
"buf` is interpreted as a scalar of size :c:member:`~Py_buffer.itemsize`. In "
"that case, both :c:member:`~Py_buffer.shape` and :c:member:`~Py_buffer."
"strides` are *NULL*."
"strides` are ``NULL``."
msgstr ""

#: ../Doc/c-api/buffer.rst:354
msgid ""
"If :c:member:`~Py_buffer.strides` is *NULL*, the array is interpreted as a "
"If :c:member:`~Py_buffer.strides` is ``NULL``, the array is interpreted as a "
"standard n-dimensional C-array. Otherwise, the consumer must access an n-"
"dimensional array as follows:"
msgstr ""
Expand Down Expand Up @@ -601,8 +601,8 @@ msgstr ""
#: ../Doc/c-api/buffer.rst:409
msgid ""
"Here is a function that returns a pointer to the element in an N-D array "
"pointed to by an N-dimensional index when there are both non-NULL strides "
"and suboffsets::"
"pointed to by an N-dimensional index when there are both non-``NULL`` "
"strides and suboffsets::"
msgstr ""

#: ../Doc/c-api/buffer.rst:428
Expand All @@ -620,7 +620,7 @@ msgstr ""
msgid ""
"Send a request to *exporter* to fill in *view* as specified by *flags*. If "
"the exporter cannot provide a buffer of the exact type, it MUST raise :c:"
"data:`PyExc_BufferError`, set :c:member:`view->obj` to *NULL* and return "
"data:`PyExc_BufferError`, set :c:member:`view->obj` to ``NULL`` and return "
"``-1``."
msgstr ""

Expand Down Expand Up @@ -717,12 +717,12 @@ msgstr ""
msgid ""
"On success, set :c:member:`view->obj` to a new reference to *exporter* and "
"return 0. Otherwise, raise :c:data:`PyExc_BufferError`, set :c:member:`view-"
">obj` to *NULL* and return ``-1``;"
">obj` to ``NULL`` and return ``-1``;"
msgstr ""

#: ../Doc/c-api/buffer.rst:521
msgid ""
"If this function is used as part of a :ref:`getbufferproc <buffer-structs>`, "
"*exporter* MUST be set to the exporting object and *flags* must be passed "
"unmodified. Otherwise, *exporter* MUST be NULL."
"unmodified. Otherwise, *exporter* MUST be ``NULL``."
msgstr ""
Loading