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

Skip to content

Make merge of 3.9 #1505

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
Dec 18, 2020
Merged

Make merge of 3.9 #1505

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
1463214
Make merge of 3.9
JulienPalard Dec 17, 2020
6882b32
Merge branch '3.9' into mdk/merge-upstream
JulienPalard Dec 17, 2020
293a38c
FIX: pospell whine on this one.
JulienPalard Dec 17, 2020
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 := b30934e9afb0af3f8e2e5f0992445be775b3c630
CPYTHON_CURRENT_COMMIT := bf353f3c2d937772a8cf30b15fd8eb7b82665ccb

CPYTHON_PATH := ../cpython/

Expand Down
12 changes: 9 additions & 3 deletions c-api/file.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: 2020-12-17 16:05+0100\n"
"PO-Revision-Date: 2018-10-18 09:48+0200\n"
"Last-Translator: \n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -149,7 +149,13 @@ msgstr ""
msgid "This function is safe to call before :c:func:`Py_Initialize`."
msgstr ""

#: c-api/file.rst:93
#: c-api/file.rst:86
msgid ""
"Raises an :ref:`auditing event <auditing>` ``setopencodehook`` with no "
"arguments."
msgstr ""

#: c-api/file.rst:95
msgid ""
"Write object *obj* to file object *p*. The only supported flag for *flags* "
"is :const:`Py_PRINT_RAW`; if given, the :func:`str` of the object is written "
Expand All @@ -161,7 +167,7 @@ msgstr ""
"l'objet est écrit à la place de l'attribut :func:`repr`. Retourne ``0`` en "
"cas de succès ou ``-1`` en cas échec ; l'exception appropriée sera levée."

#: c-api/file.rst:101
#: c-api/file.rst:103
msgid ""
"Write string *s* to file object *p*. Return ``0`` on success or ``-1`` on "
"failure; the appropriate exception will be set."
Expand Down
79 changes: 40 additions & 39 deletions c-api/type.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: 2020-12-17 16:05+0100\n"
"PO-Revision-Date: 2018-02-15 00:33+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <[email protected]>\n"
Expand Down Expand Up @@ -184,11 +184,12 @@ msgstr ""

#: c-api/type.rst:158
msgid ""
"If *bases* is ``NULL``, the *Py_tp_base* slot is used instead. If that also "
"is ``NULL``, the new type derives from :class:`object`."
"If *bases* is ``NULL``, the *Py_tp_bases* slot is used instead. If that also "
"is ``NULL``, the *Py_tp_base* slot is used instead. If that also is "
"``NULL``, the new type derives from :class:`object`."
msgstr ""

#: c-api/type.rst:161
#: c-api/type.rst:162
msgid ""
"The *module* argument can be used to record the module in which the new "
"class is defined. It must be a module object or ``NULL``. If not ``NULL``, "
Expand All @@ -197,157 +198,157 @@ msgid ""
"subclasses; it must be specified for each class individually."
msgstr ""

#: c-api/type.rst:168
#: c-api/type.rst:169
msgid "This function calls :c:func:`PyType_Ready` on the new type."
msgstr ""

#: c-api/type.rst:174
#: c-api/type.rst:175
msgid "Equivalent to ``PyType_FromModuleAndSpec(NULL, spec, bases)``."
msgstr ""

#: c-api/type.rst:180
#: c-api/type.rst:181
msgid "Equivalent to ``PyType_FromSpecWithBases(spec, NULL)``."
msgstr ""

#: c-api/type.rst:184
#: c-api/type.rst:185
msgid "Structure defining a type's behavior."
msgstr ""

#: c-api/type.rst:188
#: c-api/type.rst:189
msgid "Name of the type, used to set :c:member:`PyTypeObject.tp_name`."
msgstr ""

#: c-api/type.rst:193
#: c-api/type.rst:194
msgid ""
"Size of the instance in bytes, used to set :c:member:`PyTypeObject."
"tp_basicsize` and :c:member:`PyTypeObject.tp_itemsize`."
msgstr ""

#: c-api/type.rst:199
#: c-api/type.rst:200
msgid "Type flags, used to set :c:member:`PyTypeObject.tp_flags`."
msgstr ""

#: c-api/type.rst:201
#: c-api/type.rst:202
msgid ""
"If the ``Py_TPFLAGS_HEAPTYPE`` flag is not set, :c:func:"
"`PyType_FromSpecWithBases` sets it automatically."
msgstr ""

#: c-api/type.rst:206
#: c-api/type.rst:207
msgid ""
"Array of :c:type:`PyType_Slot` structures. Terminated by the special slot "
"value ``{0, NULL}``."
msgstr ""

#: c-api/type.rst:211
#: c-api/type.rst:212
msgid ""
"Structure defining optional functionality of a type, containing a slot ID "
"and a value pointer."
msgstr ""

#: c-api/type.rst:216
#: c-api/type.rst:217
msgid "A slot ID."
msgstr ""

#: c-api/type.rst:218
#: c-api/type.rst:219
msgid ""
"Slot IDs are named like the field names of the structures :c:type:"
"`PyTypeObject`, :c:type:`PyNumberMethods`, :c:type:`PySequenceMethods`, :c:"
"type:`PyMappingMethods` and :c:type:`PyAsyncMethods` with an added ``Py_`` "
"prefix. For example, use:"
msgstr ""

#: c-api/type.rst:224
#: c-api/type.rst:225
msgid "``Py_tp_dealloc`` to set :c:member:`PyTypeObject.tp_dealloc`"
msgstr ""

#: c-api/type.rst:225
#: c-api/type.rst:226
msgid "``Py_nb_add`` to set :c:member:`PyNumberMethods.nb_add`"
msgstr ""

#: c-api/type.rst:226
#: c-api/type.rst:227
msgid "``Py_sq_length`` to set :c:member:`PySequenceMethods.sq_length`"
msgstr ""

#: c-api/type.rst:228
#: c-api/type.rst:229
msgid ""
"The following fields cannot be set at all using :c:type:`PyType_Spec` and :c:"
"type:`PyType_Slot`:"
msgstr ""

#: c-api/type.rst:231
#: c-api/type.rst:232
msgid ":c:member:`~PyTypeObject.tp_dict`"
msgstr ""

#: c-api/type.rst:232
#: c-api/type.rst:233
msgid ":c:member:`~PyTypeObject.tp_mro`"
msgstr ""

#: c-api/type.rst:233
#: c-api/type.rst:234
msgid ":c:member:`~PyTypeObject.tp_cache`"
msgstr ""

#: c-api/type.rst:234
#: c-api/type.rst:235
msgid ":c:member:`~PyTypeObject.tp_subclasses`"
msgstr ""

#: c-api/type.rst:235
#: c-api/type.rst:236
msgid ":c:member:`~PyTypeObject.tp_weaklist`"
msgstr ""

#: c-api/type.rst:236
#: c-api/type.rst:237
msgid ":c:member:`~PyTypeObject.tp_vectorcall`"
msgstr ""

#: c-api/type.rst:237
#: c-api/type.rst:238
msgid ""
":c:member:`~PyTypeObject.tp_weaklistoffset` (see :ref:`PyMemberDef "
"<pymemberdef-offsets>`)"
msgstr ""

#: c-api/type.rst:239
#: c-api/type.rst:240
msgid ""
":c:member:`~PyTypeObject.tp_dictoffset` (see :ref:`PyMemberDef <pymemberdef-"
"offsets>`)"
msgstr ""

#: c-api/type.rst:241
#: c-api/type.rst:242
msgid ""
":c:member:`~PyTypeObject.tp_vectorcall_offset` (see :ref:`PyMemberDef "
"<pymemberdef-offsets>`)"
msgstr ""

#: c-api/type.rst:244
#: c-api/type.rst:245
msgid ""
"The following fields cannot be set using :c:type:`PyType_Spec` and :c:type:"
"`PyType_Slot` under the limited API:"
msgstr ""

#: c-api/type.rst:247
#: c-api/type.rst:248
msgid ":c:member:`~PyBufferProcs.bf_getbuffer`"
msgstr ""

#: c-api/type.rst:248
#: c-api/type.rst:249
msgid ":c:member:`~PyBufferProcs.bf_releasebuffer`"
msgstr ""

#: c-api/type.rst:250
#: c-api/type.rst:251
msgid ""
"Setting :c:data:`Py_tp_bases` may be problematic on some platforms. To avoid "
"issues, use the *bases* argument of :py:func:`PyType_FromSpecWithBases` "
"instead."
"Setting :c:data:`Py_tp_bases` or :c:data:`Py_tp_base` may be problematic on "
"some platforms. To avoid issues, use the *bases* argument of :py:func:"
"`PyType_FromSpecWithBases` instead."
msgstr ""

#: c-api/type.rst:256
#: c-api/type.rst:258
msgid "Slots in :c:type:`PyBufferProcs` in may be set in the unlimited API."
msgstr ""

#: c-api/type.rst:260
#: c-api/type.rst:262
msgid ""
"The desired value of the slot. In most cases, this is a pointer to a "
"function."
msgstr ""

#: c-api/type.rst:263
#: c-api/type.rst:265
msgid "May not be ``NULL``."
msgstr ""
Loading