Skip to content

Commit

Permalink
make merge from cpython 3.9 (#1440)
Browse files Browse the repository at this point in the history
  • Loading branch information
JulienPalard committed Oct 2, 2020
1 parent 810b3c1 commit c109850
Show file tree
Hide file tree
Showing 214 changed files with 4,737 additions and 4,905 deletions.
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -21,7 +21,7 @@
# from which we generated our po files. We use it here so when we
# test build, we're building with the .rst files that generated our
# .po files.
CPYTHON_CURRENT_COMMIT := d7cd1164c18dbf78380ce4c95bf46c7bb0ac0bb7
CPYTHON_CURRENT_COMMIT := 8fc828ec4e867c111cef137a2daeea6c3d5db2c7

CPYTHON_PATH := ../cpython/

Expand Down
44 changes: 22 additions & 22 deletions c-api/arg.po
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2020-10-01 16:00+0200\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 @@ -180,7 +180,7 @@ msgstr ""
"est préférable d'utiliser le format ``O&`` avec :c:func:"
"`PyUnicode_FSConverter` en tant que *converter*."

#: c-api/arg.rst:83 c-api/arg.rst:150
#: c-api/arg.rst:150
msgid ""
"Previously, :exc:`TypeError` was raised when embedded null code points were "
"encountered in the Python string."
Expand Down Expand Up @@ -226,7 +226,7 @@ msgstr ""
"caractères peut contenir des octets NULL. Les objets Unicode sont convertis "
"vers des chaînes de caractères C utilisant l'encodage ``'utf-8'``."

#: c-api/arg.rst:102 c-api/arg.rst:566
#: c-api/arg.rst:566
msgid "``z`` (:class:`str` or ``None``) [const char \\*]"
msgstr "``z`` (:class:`str` ou ``None``) [``const char *``]"

Expand Down Expand Up @@ -379,7 +379,7 @@ msgstr ""
"chaîne de caractères Python ne doit pas contenir de code *NULL*. Si elle en "
"contient, une exception :exc:`ValueError` est levée."

#: c-api/arg.rst:157 c-api/arg.rst:166 c-api/arg.rst:174 c-api/arg.rst:182
#: c-api/arg.rst:174 c-api/arg.rst:182
msgid ""
"Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:"
"func:`PyUnicode_AsWideCharString`."
Expand Down Expand Up @@ -588,7 +588,7 @@ msgstr ""
"Convertit un entier Python positif ou nul en un ``unsigned tiny int``, "
"stocké dans un :c:type:`unsigned char` C."

#: c-api/arg.rst:261 c-api/arg.rst:600
#: c-api/arg.rst:600
msgid "``B`` (:class:`int`) [unsigned char]"
msgstr "``B`` (:class:`int`) [``unsigned char``]"

Expand All @@ -600,15 +600,15 @@ msgstr ""
"Convertit un entier Python en un ``tiny int`` sans vérifier le débordement, "
"stocké dans un :c:type:`unsigned char` C."

#: c-api/arg.rst:264 c-api/arg.rst:594
#: c-api/arg.rst:594
msgid "``h`` (:class:`int`) [short int]"
msgstr "``h`` (:class:`int`) [``short int``]"

#: c-api/arg.rst:264
msgid "Convert a Python integer to a C :c:type:`short int`."
msgstr "Convertit un entier Python en un :c:type:`short int` C."

#: c-api/arg.rst:268 c-api/arg.rst:603
#: c-api/arg.rst:603
msgid "``H`` (:class:`int`) [unsigned short int]"
msgstr "``H`` (:class:`int`) [``unsigned short int``]"

Expand All @@ -620,15 +620,15 @@ msgstr ""
"Convertit un entier Python en un :c:type:`unsigned short int` C, sans "
"contrôle de débordement."

#: c-api/arg.rst:271 c-api/arg.rst:588
#: c-api/arg.rst:588
msgid "``i`` (:class:`int`) [int]"
msgstr "``i`` (:class:`int`) [``int``]"

#: c-api/arg.rst:271
msgid "Convert a Python integer to a plain C :c:type:`int`."
msgstr "Convertit un entier Python en un :c:type:`int` C."

#: c-api/arg.rst:275 c-api/arg.rst:606
#: c-api/arg.rst:606
msgid "``I`` (:class:`int`) [unsigned int]"
msgstr "``I`` (:class:`int`) [``unsigned int``]"

Expand All @@ -640,15 +640,15 @@ msgstr ""
"Convertit un entier Python en un :c:type:`unsigned int` C, sans contrôle de "
"le débordement."

#: c-api/arg.rst:278 c-api/arg.rst:597
#: c-api/arg.rst:597
msgid "``l`` (:class:`int`) [long int]"
msgstr "``l`` (:class:`int`) [``long int``]"

#: c-api/arg.rst:278
msgid "Convert a Python integer to a C :c:type:`long int`."
msgstr "Convertit un entier Python en un :c:type:`long int`."

#: c-api/arg.rst:282 c-api/arg.rst:609
#: c-api/arg.rst:609
msgid "``k`` (:class:`int`) [unsigned long]"
msgstr "``k`` (:class:`int`) [``unsigned long``]"

Expand All @@ -660,7 +660,7 @@ msgstr ""
"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
"le débordement."

#: c-api/arg.rst:285 c-api/arg.rst:612
#: c-api/arg.rst:612
msgid "``L`` (:class:`int`) [long long]"
msgstr "``L`` (:class:`int`) [``long long``]"

Expand All @@ -669,7 +669,7 @@ msgstr "``L`` (:class:`int`) [``long long``]"
msgid "Convert a Python integer to a C :c:type:`long long`."
msgstr "Convertit un entier Python en un :c:type:`long int`."

#: c-api/arg.rst:289 c-api/arg.rst:615
#: c-api/arg.rst:615
msgid "``K`` (:class:`int`) [unsigned long long]"
msgstr "``K`` (:class:`int`) [``unsigned long long``]"

Expand All @@ -682,7 +682,7 @@ msgstr ""
"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
"le débordement."

#: c-api/arg.rst:292 c-api/arg.rst:618
#: c-api/arg.rst:618
msgid "``n`` (:class:`int`) [Py_ssize_t]"
msgstr "``n`` (:class:`int`) [``Py_ssize_t``]"

Expand All @@ -706,7 +706,7 @@ msgstr ""
msgid "Allow :class:`bytearray` objects."
msgstr ""

#: c-api/arg.rst:303 c-api/arg.rst:626
#: c-api/arg.rst:626
msgid "``C`` (:class:`str` of length 1) [int]"
msgstr "``C`` (:class:`str` de longueur 1) [``int``]"

Expand All @@ -718,15 +718,15 @@ msgstr ""
"Convertit un caractère Python, représenté comme un objet :class:`str` de "
"longueur 1, en un :c:type:`int` C."

#: c-api/arg.rst:306 c-api/arg.rst:632
#: c-api/arg.rst:632
msgid "``f`` (:class:`float`) [float]"
msgstr "``f`` (:class:`float`) [``float``]"

#: c-api/arg.rst:306
msgid "Convert a Python floating point number to a C :c:type:`float`."
msgstr "Convertit un nombre flottant Python vers un :c:type:`float`."

#: c-api/arg.rst:309 c-api/arg.rst:629
#: c-api/arg.rst:629
msgid "``d`` (:class:`float`) [double]"
msgstr "``d`` (:class:`float`) [``double``]"

Expand All @@ -748,7 +748,7 @@ msgstr ""
msgid "Other objects"
msgstr "Autres objets"

#: c-api/arg.rst:320 c-api/arg.rst:643
#: c-api/arg.rst:643
msgid "``O`` (object) [PyObject \\*]"
msgstr "``O`` (objet) [``PyObject *``]"

Expand Down Expand Up @@ -777,7 +777,7 @@ msgid ""
"required type, :exc:`TypeError` is raised."
msgstr ""

#: c-api/arg.rst:352 c-api/arg.rst:657
#: c-api/arg.rst:657
msgid "``O&`` (object) [*converter*, *anything*]"
msgstr "``O&`` (objet) [*converter*, *anything*]"

Expand Down Expand Up @@ -825,7 +825,7 @@ msgid ""
"how Python tests values for truth."
msgstr ""

#: c-api/arg.rst:366 c-api/arg.rst:660
#: c-api/arg.rst:660
msgid "``(items)`` (:class:`tuple`) [*matching-items*]"
msgstr "``(items)`` (:class:`tuple`) [*matching-items*]"

Expand Down Expand Up @@ -1121,7 +1121,7 @@ msgid ""
"string pointer is ``NULL``, ``None`` is returned."
msgstr ""

#: c-api/arg.rst:566 c-api/arg.rst:582
#: c-api/arg.rst:582
msgid "Same as ``s``."
msgstr ""

Expand All @@ -1132,7 +1132,7 @@ msgid ""
"`Py_ssize_t`]"
msgstr "``z#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"

#: c-api/arg.rst:569 c-api/arg.rst:585
#: c-api/arg.rst:585
msgid "Same as ``s#``."
msgstr ""

Expand Down
40 changes: 16 additions & 24 deletions c-api/buffer.po
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2020-10-01 16:00+0200\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 @@ -431,38 +431,34 @@ msgid ""
"flags below it."
msgstr ""

#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
#: c-api/buffer.rst:296 c-api/buffer.rst:321
msgid "Request"
msgstr ""

#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
#: c-api/buffer.rst:296 c-api/buffer.rst:321
msgid "shape"
msgstr ""

#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
#: c-api/buffer.rst:296 c-api/buffer.rst:321
msgid "strides"
msgstr ""

#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
#: c-api/buffer.rst:296 c-api/buffer.rst:321
msgid "suboffsets"
msgstr ""

#: c-api/buffer.rst:274 c-api/buffer.rst:276 c-api/buffer.rst:278
#: c-api/buffer.rst:298 c-api/buffer.rst:300 c-api/buffer.rst:302
#: c-api/buffer.rst:304 c-api/buffer.rst:323 c-api/buffer.rst:325
#: c-api/buffer.rst:327 c-api/buffer.rst:329 c-api/buffer.rst:331
#: c-api/buffer.rst:333 c-api/buffer.rst:335 c-api/buffer.rst:337
#: c-api/buffer.rst:276 c-api/buffer.rst:298 c-api/buffer.rst:302
#: c-api/buffer.rst:323 c-api/buffer.rst:327 c-api/buffer.rst:331
#: c-api/buffer.rst:335 c-api/buffer.rst:337
msgid "yes"
msgstr "oui"

#: c-api/buffer.rst:274 c-api/buffer.rst:323 c-api/buffer.rst:325
#: c-api/buffer.rst:323 c-api/buffer.rst:325
msgid "if needed"
msgstr ""

#: c-api/buffer.rst:276 c-api/buffer.rst:278 c-api/buffer.rst:280
#: c-api/buffer.rst:298 c-api/buffer.rst:300 c-api/buffer.rst:302
#: c-api/buffer.rst:304 c-api/buffer.rst:327 c-api/buffer.rst:329
#: c-api/buffer.rst:331 c-api/buffer.rst:333 c-api/buffer.rst:335
#: c-api/buffer.rst:278 c-api/buffer.rst:298 c-api/buffer.rst:302
#: c-api/buffer.rst:327 c-api/buffer.rst:331 c-api/buffer.rst:335
#: c-api/buffer.rst:337
msgid "NULL"
msgstr ""
Expand All @@ -478,12 +474,11 @@ msgid ""
"must be C-contiguous."
msgstr ""

#: c-api/buffer.rst:296 c-api/buffer.rst:321
#: c-api/buffer.rst:321
msgid "contig"
msgstr ""

#: c-api/buffer.rst:298 c-api/buffer.rst:304 c-api/buffer.rst:335
#: c-api/buffer.rst:337
#: c-api/buffer.rst:304 c-api/buffer.rst:337
msgid "C"
msgstr ""

Expand Down Expand Up @@ -524,18 +519,15 @@ msgstr ""
msgid "format"
msgstr "format"

#: c-api/buffer.rst:323 c-api/buffer.rst:325 c-api/buffer.rst:327
#: c-api/buffer.rst:329 c-api/buffer.rst:331 c-api/buffer.rst:333
#: c-api/buffer.rst:325 c-api/buffer.rst:329 c-api/buffer.rst:333
msgid "U"
msgstr ""

#: c-api/buffer.rst:323 c-api/buffer.rst:327 c-api/buffer.rst:331
#: c-api/buffer.rst:335
#: c-api/buffer.rst:327 c-api/buffer.rst:335
msgid "0"
msgstr "0"

#: c-api/buffer.rst:325 c-api/buffer.rst:329 c-api/buffer.rst:333
#: c-api/buffer.rst:337
#: c-api/buffer.rst:329 c-api/buffer.rst:337
msgid "1 or 0"
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions c-api/bytes.po
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2020-10-01 16:00+0200\n"
"PO-Revision-Date: 2018-07-03 11:50+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -110,7 +110,7 @@ msgstr ""
msgid ":attr:`%c`"
msgstr ""

#: c-api/bytes.rst:72 c-api/bytes.rst:75 c-api/bytes.rst:93 c-api/bytes.rst:96
#: c-api/bytes.rst:75 c-api/bytes.rst:96
msgid "int"
msgstr "*int*"

Expand Down

0 comments on commit c109850

Please sign in to comment.