Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Make merge of 3.9 #1512

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
Jan 27, 2021
Merged

Make merge of 3.9 #1512

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
243a11e
Make merge of 3.9
JulienPalard Jan 27, 2021
b47cfb9
It causes a build failure here.
JulienPalard Jan 27, 2021
b965fd8
Merge branch '3.9' into merge
JulienPalard Jan 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 @@ -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 := bf353f3c2d937772a8cf30b15fd8eb7b82665ccb
CPYTHON_CURRENT_COMMIT := 895591c1f0bdec5ad357fe6a5fd0875990061357

CPYTHON_PATH := ../cpython/

Expand Down
17 changes: 10 additions & 7 deletions c-api/bool.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: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand All @@ -32,10 +32,13 @@ msgstr ""
"disponibles."

#: c-api/bool.rst:16
msgid "Return true if *o* is of type :c:data:`PyBool_Type`."
#, fuzzy
msgid ""
"Return true if *o* is of type :c:data:`PyBool_Type`. This function always "
"succeeds."
msgstr "Renvoie vrai si *o* est de type :c:data:`PyBook_Type`."

#: c-api/bool.rst:21
#: c-api/bool.rst:22
msgid ""
"The Python ``False`` object. This object has no methods. It needs to be "
"treated just like any other object with respect to reference counts."
Expand All @@ -44,7 +47,7 @@ msgstr ""
"le comptage de référence, il doit être traité comme n'importe quel autre "
"objet."

#: c-api/bool.rst:27
#: c-api/bool.rst:28
msgid ""
"The Python ``True`` object. This object has no methods. It needs to be "
"treated just like any other object with respect to reference counts."
Expand All @@ -53,23 +56,23 @@ msgstr ""
"le comptage de références, il doit être traité comme n'importe quel autre "
"objet."

#: c-api/bool.rst:33
#: c-api/bool.rst:34
msgid ""
"Return :const:`Py_False` from a function, properly incrementing its "
"reference count."
msgstr ""
"Renvoie :const:`Py_False` depuis une fonction tout en incrémentant son "
"nombre de références."

#: c-api/bool.rst:39
#: c-api/bool.rst:40
msgid ""
"Return :const:`Py_True` from a function, properly incrementing its reference "
"count."
msgstr ""
"Renvoie :const:`Py_True` depuis une fonction, en incrémentant son nombre de "
"références."

#: c-api/bool.rst:45
#: c-api/bool.rst:46
msgid ""
"Return a new reference to :const:`Py_True` or :const:`Py_False` depending on "
"the truth value of *v*."
Expand Down
8 changes: 5 additions & 3 deletions c-api/bytearray.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: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: 2018-10-04 12:21+0200\n"
"Last-Translator: Julien Palard <[email protected]>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -37,17 +37,19 @@ msgid "Type check macros"
msgstr "Macros de vérification de type"

#: c-api/bytearray.rst:27
#, fuzzy
msgid ""
"Return true if the object *o* is a bytearray object or an instance of a "
"subtype of the bytearray type."
"subtype of the bytearray type. This function always succeeds."
msgstr ""
"Renvoie vrai si l'objet *o* est un ``bytearray`` ou une instance d'un sous-"
"type du type ``bytearray``."

#: c-api/bytearray.rst:33
#, fuzzy
msgid ""
"Return true if the object *o* is a bytearray object, but not an instance of "
"a subtype of the bytearray type."
"a subtype of the bytearray type. This function always succeeds."
msgstr ""
"Renvoie vrai si l'objet *o* est un ``bytearray``, mais pas une instance d'un "
"sous-type du type ``bytearray``."
Expand Down
6 changes: 3 additions & 3 deletions c-api/bytes.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: 2020-10-01 16:00+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: 2018-07-03 11:50+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -43,7 +43,7 @@ msgstr ""
#, fuzzy
msgid ""
"Return true if the object *o* is a bytes object or an instance of a subtype "
"of the bytes type."
"of the bytes type. This function always succeeds."
msgstr ""
"Renvoie vrai si l'objet *o* est un ``bytearray`` ou une instance d'un sous-"
"type du type ``bytearray``."
Expand All @@ -52,7 +52,7 @@ msgstr ""
#, fuzzy
msgid ""
"Return true if the object *o* is a bytes object, but not an instance of a "
"subtype of the bytes type."
"subtype of the bytes type. This function always succeeds."
msgstr ""
"Renvoie vrai si l'objet *o* est un ``bytearray``, mais pas une instance d'un "
"sous-type du type ``bytearray``."
Expand Down
52 changes: 27 additions & 25 deletions c-api/capsule.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: 2020-10-01 16:00+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -46,93 +46,95 @@ msgid ""
msgstr ""

#: c-api/capsule.rst:37
msgid "Return true if its argument is a :c:type:`PyCapsule`."
msgid ""
"Return true if its argument is a :c:type:`PyCapsule`. This function always "
"succeeds."
msgstr ""

#: c-api/capsule.rst:42
#: c-api/capsule.rst:43
msgid ""
"Create a :c:type:`PyCapsule` encapsulating the *pointer*. The *pointer* "
"argument may not be ``NULL``."
msgstr ""

#: c-api/capsule.rst:45
#: c-api/capsule.rst:46
msgid "On failure, set an exception and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:47
#: c-api/capsule.rst:48
msgid ""
"The *name* string may either be ``NULL`` or a pointer to a valid C string. "
"If non-``NULL``, this string must outlive the capsule. (Though it is "
"permitted to free it inside the *destructor*.)"
msgstr ""

#: c-api/capsule.rst:51
#: c-api/capsule.rst:52
msgid ""
"If the *destructor* argument is not ``NULL``, it will be called with the "
"capsule as its argument when it is destroyed."
msgstr ""

#: c-api/capsule.rst:54
#: c-api/capsule.rst:55
msgid ""
"If this capsule will be stored as an attribute of a module, the *name* "
"should be specified as ``modulename.attributename``. This will enable other "
"modules to import the capsule using :c:func:`PyCapsule_Import`."
msgstr ""

#: c-api/capsule.rst:61
#: c-api/capsule.rst:62
msgid ""
"Retrieve the *pointer* stored in the capsule. On failure, set an exception "
"and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:64
#: c-api/capsule.rst:65
msgid ""
"The *name* parameter must compare exactly to the name stored in the capsule. "
"If the name stored in the capsule is ``NULL``, the *name* passed in must "
"also be ``NULL``. Python uses the C function :c:func:`strcmp` to compare "
"capsule names."
msgstr ""

#: c-api/capsule.rst:72
#: c-api/capsule.rst:73
msgid ""
"Return the current destructor stored in the capsule. On failure, set an "
"exception and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:75
#: c-api/capsule.rst:76
msgid ""
"It is legal for a capsule to have a ``NULL`` destructor. This makes a "
"``NULL`` return code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :"
"c:func:`PyErr_Occurred` to disambiguate."
msgstr ""

#: c-api/capsule.rst:82
#: c-api/capsule.rst:83
msgid ""
"Return the current context stored in the capsule. On failure, set an "
"exception and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:85
#: c-api/capsule.rst:86
msgid ""
"It is legal for a capsule to have a ``NULL`` context. This makes a ``NULL`` "
"return code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :c:func:"
"`PyErr_Occurred` to disambiguate."
msgstr ""

#: c-api/capsule.rst:92
#: c-api/capsule.rst:93
msgid ""
"Return the current name stored in the capsule. On failure, set an exception "
"and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:95
#: c-api/capsule.rst:96
msgid ""
"It is legal for a capsule to have a ``NULL`` name. This makes a ``NULL`` "
"return code somewhat ambiguous; use :c:func:`PyCapsule_IsValid` or :c:func:"
"`PyErr_Occurred` to disambiguate."
msgstr ""

#: c-api/capsule.rst:102
#: c-api/capsule.rst:103
msgid ""
"Import a pointer to a C object from a capsule attribute in a module. The "
"*name* parameter should specify the full name to the attribute, as in "
Expand All @@ -142,13 +144,13 @@ msgid ""
"import the module conventionally (using :c:func:`PyImport_ImportModule`)."
msgstr ""

#: c-api/capsule.rst:109
#: c-api/capsule.rst:110
msgid ""
"Return the capsule's internal *pointer* on success. On failure, set an "
"exception and return ``NULL``."
msgstr ""

#: c-api/capsule.rst:115
#: c-api/capsule.rst:116
msgid ""
"Determines whether or not *capsule* is a valid capsule. A valid capsule is "
"non-``NULL``, passes :c:func:`PyCapsule_CheckExact`, has a non-``NULL`` "
Expand All @@ -157,40 +159,40 @@ msgid ""
"compared.)"
msgstr ""

#: c-api/capsule.rst:121
#: c-api/capsule.rst:122
msgid ""
"In other words, if :c:func:`PyCapsule_IsValid` returns a true value, calls "
"to any of the accessors (any function starting with :c:func:`PyCapsule_Get`) "
"are guaranteed to succeed."
msgstr ""

#: c-api/capsule.rst:125
#: c-api/capsule.rst:126
msgid ""
"Return a nonzero value if the object is valid and matches the name passed "
"in. Return ``0`` otherwise. This function will not fail."
msgstr ""

#: c-api/capsule.rst:131
#: c-api/capsule.rst:132
msgid "Set the context pointer inside *capsule* to *context*."
msgstr ""

#: c-api/capsule.rst:140 c-api/capsule.rst:157
#: c-api/capsule.rst:141 c-api/capsule.rst:158
msgid ""
"Return ``0`` on success. Return nonzero and set an exception on failure."
msgstr ""

#: c-api/capsule.rst:138
#: c-api/capsule.rst:139
msgid "Set the destructor inside *capsule* to *destructor*."
msgstr ""

#: c-api/capsule.rst:145
#: c-api/capsule.rst:146
msgid ""
"Set the name inside *capsule* to *name*. If non-``NULL``, the name must "
"outlive the capsule. If the previous *name* stored in the capsule was not "
"``NULL``, no attempt is made to free it."
msgstr ""

#: c-api/capsule.rst:154
#: c-api/capsule.rst:155
msgid ""
"Set the void pointer inside *capsule* to *pointer*. The pointer may not be "
"``NULL``."
Expand Down
16 changes: 9 additions & 7 deletions c-api/cell.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: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: 2019-05-09 10:14+0200\n"
"Last-Translator: \n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -51,12 +51,14 @@ msgstr "Type objet correspondant aux objets cellules."

#: c-api/cell.rst:30
#, fuzzy
msgid "Return true if *ob* is a cell object; *ob* must not be ``NULL``."
msgid ""
"Return true if *ob* is a cell object; *ob* must not be ``NULL``. This "
"function always succeeds."
msgstr ""
"Renvoie ``True`` si *ob* est un objet cellule ; *ob* ne doit pas être à "
"*NULL*."

#: c-api/cell.rst:35
#: c-api/cell.rst:36
#, fuzzy
msgid ""
"Create and return a new cell object containing the value *ob*. The parameter "
Expand All @@ -65,11 +67,11 @@ msgstr ""
"Crée et retourne un nouvel objet cellule contenant la valeur *ob*. Le "
"paramètre peut être mis à *NULL*."

#: c-api/cell.rst:41
#: c-api/cell.rst:42
msgid "Return the contents of the cell *cell*."
msgstr "Renvoie le contenu de la cellule *cell*."

#: c-api/cell.rst:46
#: c-api/cell.rst:47
#, fuzzy
msgid ""
"Return the contents of the cell *cell*, but without checking that *cell* is "
Expand All @@ -78,7 +80,7 @@ msgstr ""
"Renvoie le contenu de la cellule *cell*, mais sans vérifier si *cell* est "
"non *NULL* et sans vérifier si c'est un objet cellule."

#: c-api/cell.rst:52
#: c-api/cell.rst:53
#, fuzzy
msgid ""
"Set the contents of the cell object *cell* to *value*. This releases the "
Expand All @@ -91,7 +93,7 @@ msgstr ""
"pas être *NULL* ; si ce n'est pas un objet cellule, ``-1`` est renvoyé. Si "
"c'est un objet cellule, renvoie ``0``."

#: c-api/cell.rst:60
#: c-api/cell.rst:61
#, fuzzy
msgid ""
"Sets the value of the cell object *cell* to *value*. No reference counts "
Expand Down
7 changes: 5 additions & 2 deletions c-api/code.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: 2020-08-24 09:01+0200\n"
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
"PO-Revision-Date: 2018-02-15 00:30+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -45,7 +45,10 @@ msgstr ""
"class:`code`."

#: c-api/code.rst:30
msgid "Return true if *co* is a :class:`code` object."
#, fuzzy
msgid ""
"Return true if *co* is a :class:`code` object. This function always "
"succeeds."
msgstr "Renvoie vrai si *co* est un objet :class:`code`."

#: c-api/code.rst:34
Expand Down
Loading