Skip to content

Commit 3de5dcd

Browse files
Seluj78Seluj78
authored
make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c (#987)
* make merge from cpython:25ce77dd2455abbb6e2c9e055bbc98954642fa7c * Fixed silly fuzzies for CI * More make merge from my PRs
1 parent 8fa3780 commit 3de5dcd

File tree

131 files changed

+5071
-4401
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+5071
-4401
lines changed

‎c-api/arg.po‎

Lines changed: 37 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
99
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -114,7 +114,7 @@ msgstr "Sauf indication contraire, les tampons ne se terminent pas par NUL."
114114
msgid ""
115115
"Some formats require a read-only :term:`bytes-like object`, and set a "
116116
"pointer instead of a buffer structure. They work by checking that the "
117-
"object's :c:member:`PyBufferProcs.bf_releasebuffer` field is *NULL*, which "
117+
"object's :c:member:`PyBufferProcs.bf_releasebuffer` field is ``NULL``, which "
118118
"disallows mutable objects such as :class:`bytearray`."
119119
msgstr ""
120120

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

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

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

218222
#: ../Doc/c-api/arg.rst:110
219223
msgid ""
@@ -222,9 +226,10 @@ msgid ""
222226
msgstr ""
223227

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

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

344350
#: ../Doc/c-api/arg.rst:176
351+
#, fuzzy
345352
msgid ""
346353
"Like ``u#``, but the Python object may also be ``None``, in which case the :"
347-
"c:type:`Py_UNICODE` pointer is set to *NULL*."
354+
"c:type:`Py_UNICODE` pointer is set to ``NULL``."
348355
msgstr ""
349356
"Comme ``u#``, mais l'objet Python peut également être ``None``, auquel cas "
350357
"le pointeur :c:type:`Py_UNICODE` vaut *NULL*."
@@ -386,7 +393,7 @@ msgstr ""
386393
msgid ""
387394
"This format requires two arguments. The first is only used as input, and "
388395
"must be a :c:type:`const char\\*` which points to the name of an encoding as "
389-
"a NUL-terminated string, or *NULL*, in which case ``'utf-8'`` encoding is "
396+
"a NUL-terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is "
390397
"used. An exception is raised if the named encoding is not known to Python. "
391398
"The second argument must be a :c:type:`char\\*\\*`; the value of the pointer "
392399
"it references will be set to a buffer with the contents of the argument "
@@ -432,8 +439,8 @@ msgstr ""
432439
msgid ""
433440
"It requires three arguments. The first is only used as input, and must be "
434441
"a :c:type:`const char\\*` which points to the name of an encoding as a NUL-"
435-
"terminated string, or *NULL*, in which case ``'utf-8'`` encoding is used. An "
436-
"exception is raised if the named encoding is not known to Python. The "
442+
"terminated string, or ``NULL``, in which case ``'utf-8'`` encoding is used. "
443+
"An exception is raised if the named encoding is not known to Python. The "
437444
"second argument must be a :c:type:`char\\*\\*`; the value of the pointer it "
438445
"references will be set to a buffer with the contents of the argument text. "
439446
"The text will be encoded in the encoding specified by the first argument. "
@@ -447,16 +454,16 @@ msgstr "Il existe deux modes de fonctionnement :"
447454

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

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

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

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

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

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

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

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

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

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

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

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

11871195
#: ../Doc/c-api/arg.rst:660
@@ -1214,7 +1222,7 @@ msgstr ""
12141222
#: ../Doc/c-api/arg.rst:670
12151223
msgid ""
12161224
"If there is an error in the format string, the :exc:`SystemError` exception "
1217-
"is set and *NULL* returned."
1225+
"is set and ``NULL`` returned."
12181226
msgstr ""
12191227

12201228
#: ../Doc/c-api/arg.rst:675

‎c-api/buffer.po‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-10-09 17:54+0200\n"
8+
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
99
"PO-Revision-Date: 2018-10-04 12:18+0200\n"
1010
"Last-Translator: \n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -202,7 +202,7 @@ msgstr ""
202202
#: ../Doc/c-api/buffer.rst:104
203203
msgid ""
204204
"A new reference to the exporting object. The reference is owned by the "
205-
"consumer and automatically decremented and set to *NULL* by :c:func:"
205+
"consumer and automatically decremented and set to ``NULL`` by :c:func:"
206206
"`PyBuffer_Release`. The field is the equivalent of the return value of any "
207207
"standard C-API function."
208208
msgstr ""
@@ -211,7 +211,7 @@ msgstr ""
211211
msgid ""
212212
"As a special case, for *temporary* buffers that are wrapped by :c:func:"
213213
"`PyMemoryView_FromBuffer` or :c:func:`PyBuffer_FillInfo` this field is "
214-
"*NULL*. In general, exporting objects MUST NOT use this scheme."
214+
"``NULL``. In general, exporting objects MUST NOT use this scheme."
215215
msgstr ""
216216

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

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

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

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

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

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

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

343343
#: ../Doc/c-api/buffer.rst:204
@@ -403,7 +403,7 @@ msgstr ""
403403
#: ../Doc/c-api/buffer.rst:250
404404
msgid ""
405405
"Controls the :c:member:`~Py_buffer.format` field. If set, this field MUST be "
406-
"filled in correctly. Otherwise, this field MUST be *NULL*."
406+
"filled in correctly. Otherwise, this field MUST be ``NULL``."
407407
msgstr ""
408408

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

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

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

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

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

0 commit comments

Comments
 (0)