Skip to content

Make merge #1782

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
christopheNan merged 2 commits into from
Nov 29, 2021
Merged

Make merge #1782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
849e91a
Make merge
JulienPalard Nov 27, 2021
f099b32
Merge branch '3.10' into mdk/merge
christopheNan Nov 27, 2021
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,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 := 75ed2ce9e86a7f213fa54e6f8cbbb3ab6f25b5a2
CPYTHON_CURRENT_COMMIT := 57100c86baa8451a568348646834380cd425b858
LANGUAGE := fr
BRANCH := 3.10

Expand Down
27 changes: 14 additions & 13 deletions c-api/iter.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\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-09-23 16:16+0200\n"
"POT-Creation-Date: 2021-11-27 10:27+0100\n"
"PO-Revision-Date: 2018-02-15 00:33+0100\n"
"Last-Translator: Julien Palard <julien@palard.fr>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand All @@ -25,8 +25,8 @@ msgstr "Il existe deux fonctions dédiées à l'interaction avec les itérateurs
#: c-api/iter.rst:12
#, fuzzy
msgid ""
"Return non-zero if the object *o* supports the iterator protocol, and ``0`` "
"otherwise. This function always succeeds."
"Return non-zero if the object *o* can be safely passed to :c:func:"
"`PyIter_Next`, and ``0`` otherwise. This function always succeeds."
msgstr "Renvoie vrai si l'objet *o* supporte le protocole d'itération."

#: c-api/iter.rst:17
Expand All @@ -39,45 +39,46 @@ msgstr "Renvoie vrai si l'objet *o* supporte le protocole d'itération."
#: c-api/iter.rst:24
#, fuzzy
msgid ""
"Return the next value from the iteration *o*. The object must be an "
"iterator (it is up to the caller to check this). If there are no remaining "
"values, returns ``NULL`` with no exception set. If an error occurs while "
"retrieving the item, returns ``NULL`` and passes along the exception."
"Return the next value from the iterator *o*. The object must be an iterator "
"according to :c:func:`PyIter_Check` (it is up to the caller to check this). "
"If there are no remaining values, returns ``NULL`` with no exception set. If "
"an error occurs while retrieving the item, returns ``NULL`` and passes along "
"the exception."
msgstr ""
"Renvoie la valeur suivante d'une itération de *o*. L'objet doit être un "
"itérateur (c'est à l'appelant de faire cette vérification). Renvoie *NULL* "
"s'il n'y a plus de valeurs, sans déclarer d'exception. Renvoie *NULL* en "
"déclarant une exception si une erreur survient lors de la récupération d'un "
"élément."

#: c-api/iter.rst:29
#: c-api/iter.rst:30
msgid ""
"To write a loop which iterates over an iterator, the C code should look "
"something like this::"
msgstr ""
"Pour écrire une boucle itérant un itérateur, le code C devrait ressembler "
"à ::"

#: c-api/iter.rst:58
#: c-api/iter.rst:59
msgid ""
"The enum value used to represent different results of :c:func:`PyIter_Send`."
msgstr ""

#: c-api/iter.rst:65
#: c-api/iter.rst:66
msgid "Sends the *arg* value into the iterator *iter*. Returns:"
msgstr ""

#: c-api/iter.rst:67
#: c-api/iter.rst:68
msgid ""
"``PYGEN_RETURN`` if iterator returns. Return value is returned via *presult*."
msgstr ""

#: c-api/iter.rst:68
#: c-api/iter.rst:69
msgid ""
"``PYGEN_NEXT`` if iterator yields. Yielded value is returned via *presult*."
msgstr ""

#: c-api/iter.rst:69
#: c-api/iter.rst:70
msgid ""
"``PYGEN_ERROR`` if iterator has raised and exception. *presult* is set to "
"``NULL``."
Expand Down
16 changes: 8 additions & 8 deletions c-api/typeobj.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\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-11-04 18:14+0100\n"
"POT-Creation-Date: 2021-11-27 10:27+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -2282,9 +2282,9 @@ msgstr ""

#: c-api/typeobj.rst:1523
msgid ""
"An optional pointer to a function that returns an iterator for the object. "
"Its presence normally signals that the instances of this type are iterable "
"(although sequences may be iterable without this function)."
"An optional pointer to a function that returns an :term:`iterator` for the "
"object. Its presence normally signals that the instances of this type are :"
"term:`iterable` (although sequences may be iterable without this function)."
msgstr ""

#: c-api/typeobj.rst:1527
Expand All @@ -2293,8 +2293,8 @@ msgstr ""

#: c-api/typeobj.rst:1538
msgid ""
"An optional pointer to a function that returns the next item in an iterator. "
"The signature is::"
"An optional pointer to a function that returns the next item in an :term:"
"`iterator`. The signature is::"
msgstr ""

#: c-api/typeobj.rst:1543
Expand Down Expand Up @@ -3174,8 +3174,8 @@ msgstr ""

#: c-api/typeobj.rst:2431
msgid ""
"The returned object must be an iterator, i.e. :c:func:`PyIter_Check` must "
"return ``1`` for it."
"The returned object must be an :term:`iterator`, i.e. :c:func:`PyIter_Check` "
"must return ``1`` for it."
msgstr ""

#: c-api/typeobj.rst:2434
Expand Down
Loading