make merge (#1042)

Author: JulienPalard

.travis.yml

@@ -15,4 +15,4 @@ script:
   - '[ -n "$CHANGED_FILES" ] && printf -- "- %s\n" $CHANGED_FILES ;:'
   - '[ -n "$CHANGED_FILES" ] && powrap --check --quiet $CHANGED_FILES || :'
   - '[ -n "$CHANGED_FILES" ] && pospell -p dict -l fr_FR $CHANGED_FILES || :'
-  - '[ -n "$CHANGED_FILES" ] && make CPYTHON_CLONE=/tmp/cpython/ COMMIT=4d1abedce9422473af2ac78047e55cde73208208 || :'
+  - '[ -n "$CHANGED_FILES" ] && make CPYTHON_CLONE=/tmp/cpython/ COMMIT=e21aa61e96f8343200e765d119ebe778873a6bf1 || :'

c-api/mapping.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 18:54+0100\n"
+"POT-Creation-Date: 2019-12-05 23:16+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"
@@ -29,81 +29,81 @@ msgid ""
 "Return ``1`` if the object provides mapping protocol or supports slicing, "
 "and ``0`` otherwise.  Note that it returns ``1`` for Python classes with a :"
 "meth:`__getitem__` method since in general case it is impossible to "
-"determine what the type of keys it supports.  This function always succeeds."
+"determine what type of keys it supports. This function always succeeds."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:26
+#: ../Doc/c-api/mapping.rst:25
 msgid ""
 "Returns the number of keys in object *o* on success, and ``-1`` on failure. "
 "This is equivalent to the Python expression ``len(o)``."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:32
+#: ../Doc/c-api/mapping.rst:31
 msgid ""
 "Return element of *o* corresponding to the string *key* or ``NULL`` on "
 "failure. This is the equivalent of the Python expression ``o[key]``. See "
 "also :c:func:`PyObject_GetItem`."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:39
+#: ../Doc/c-api/mapping.rst:38
 msgid ""
 "Map the string *key* to the value *v* in object *o*.  Returns ``-1`` on "
 "failure.  This is the equivalent of the Python statement ``o[key] = v``. See "
 "also :c:func:`PyObject_SetItem`."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:46
+#: ../Doc/c-api/mapping.rst:45
 msgid ""
 "Remove the mapping for the object *key* from the object *o*.  Return ``-1`` "
 "on failure.  This is equivalent to the Python statement ``del o[key]``. This "
 "is an alias of :c:func:`PyObject_DelItem`."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:53
+#: ../Doc/c-api/mapping.rst:52
 msgid ""
 "Remove the mapping for the string *key* from the object *o*.  Return ``-1`` "
 "on failure.  This is equivalent to the Python statement ``del o[key]``."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:70
+#: ../Doc/c-api/mapping.rst:58 ../Doc/c-api/mapping.rst:69
 msgid ""
 "Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. "
 "This is equivalent to the Python expression ``key in o``. This function "
 "always succeeds."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:63
+#: ../Doc/c-api/mapping.rst:62
 msgid ""
 "Note that exceptions which occur while calling the :meth:`__getitem__` "
 "method will get suppressed. To get error reporting use :c:func:"
 "`PyObject_GetItem()` instead."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:74
+#: ../Doc/c-api/mapping.rst:73
 msgid ""
 "Note that exceptions which occur while calling the :meth:`__getitem__` "
 "method and creating a temporary string object will get suppressed. To get "
 "error reporting use :c:func:`PyMapping_GetItemString()` instead."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:81
+#: ../Doc/c-api/mapping.rst:80
 msgid ""
 "On success, return a list of the keys in object *o*.  On failure, return "
 "``NULL``."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:84 ../Doc/c-api/mapping.rst:93
-#: ../Doc/c-api/mapping.rst:102
+#: ../Doc/c-api/mapping.rst:83 ../Doc/c-api/mapping.rst:92
+#: ../Doc/c-api/mapping.rst:101
 msgid "Previously, the function returned a list or a tuple."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:90
+#: ../Doc/c-api/mapping.rst:89
 msgid ""
 "On success, return a list of the values in object *o*.  On failure, return "
 "``NULL``."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:99
+#: ../Doc/c-api/mapping.rst:98
 msgid ""
 "On success, return a list of the items in object *o*, where each item is a "
 "tuple containing a key-value pair.  On failure, return ``NULL``."

c-api/sys.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-15 23:53+0100\n"
+"POT-Creation-Date: 2019-12-05 23:16+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"
@@ -357,7 +357,7 @@ msgstr ""
 
 #: ../Doc/c-api/sys.rst:312
 msgid ""
-"Raises an auditing event with any active hooks. Returns zero for success and "
+"Raise an auditing event with any active hooks. Return zero for success and "
 "non-zero with an exception set on failure."
 msgstr ""
 
@@ -378,41 +378,40 @@ msgstr ""
 
 #: ../Doc/c-api/sys.rst:330
 msgid ""
-"Adds to the collection of active auditing hooks. Returns zero for success "
-"and non-zero on failure. If the runtime has been initialized, also sets an "
-"error on failure. Hooks added through this API are called for all "
-"interpreters created by the runtime."
+"Append the callable *hook* to the list of active auditing hooks. Return zero "
+"for success and non-zero on failure. If the runtime has been initialized, "
+"also set an error on failure. Hooks added through this API are called for "
+"all interpreters created by the runtime."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:335
+#: ../Doc/c-api/sys.rst:336
+msgid ""
+"The *userData* pointer is passed into the hook function. Since hook "
+"functions may be called from different runtimes, this pointer should not "
+"refer directly to Python state."
+msgstr ""
+
+#: ../Doc/c-api/sys.rst:340
 msgid ""
 "This function is safe to call before :c:func:`Py_Initialize`. When called "
 "after runtime initialization, existing audit hooks are notified and may "
 "silently abort the operation by raising an error subclassed from :class:"
 "`Exception` (other errors will not be silenced)."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:340
+#: ../Doc/c-api/sys.rst:345
 msgid ""
 "The hook function is of type :c:type:`int (*)(const char *event, PyObject "
 "*args, void *userData)`, where *args* is guaranteed to be a :c:type:"
 "`PyTupleObject`. The hook function is always called with the GIL held by the "
 "Python interpreter that raised the event."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:345
-msgid ""
-"The *userData* pointer is passed into the hook function. Since hook "
-"functions may be called from different runtimes, this pointer should not "
-"refer directly to Python state."
-msgstr ""
-
-#: ../Doc/c-api/sys.rst:349
+#: ../Doc/c-api/sys.rst:350
 msgid ""
-"See :pep:`578` for a detailed description of auditing. Functions in the "
-"runtime and standard library that raise events include the details in each "
-"function's documentation and listed in the :ref:`audit events table <audit-"
-"events>`."
+"See :pep:`578` for a detailed description of auditing.  Functions in the "
+"runtime and standard library that raise events are listed in the :ref:`audit "
+"events table <audit-events>`. Details are in each function's documentation."
 msgstr ""
 
 #: ../Doc/c-api/sys.rst:None
@@ -421,7 +420,7 @@ msgid ""
 "arguments."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:356
+#: ../Doc/c-api/sys.rst:357
 msgid ""
 "If the interpreter is initialized, this function raises a auditing event "
 "``sys.addaudithook`` with no arguments. If any existing hooks raise an "
@@ -430,11 +429,11 @@ msgid ""
 "hook has been added unless they control all existing hooks."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:368
+#: ../Doc/c-api/sys.rst:369
 msgid "Process Control"
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:375
+#: ../Doc/c-api/sys.rst:376
 msgid ""
 "Print a fatal error message and kill the process.  No cleanup is performed. "
 "This function should only be invoked when a condition is detected that would "
@@ -444,18 +443,18 @@ msgid ""
 "file:`core` file."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:389
+#: ../Doc/c-api/sys.rst:390
 msgid ""
 "Exit the current process.  This calls :c:func:`Py_FinalizeEx` and then calls "
 "the standard C library function ``exit(status)``.  If :c:func:"
 "`Py_FinalizeEx` indicates an error, the exit status is set to 120."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:393
+#: ../Doc/c-api/sys.rst:394
 msgid "Errors from finalization no longer ignored."
 msgstr ""
 
-#: ../Doc/c-api/sys.rst:403
+#: ../Doc/c-api/sys.rst:404
 msgid ""
 "Register a cleanup function to be called by :c:func:`Py_FinalizeEx`.  The "
 "cleanup function will be called with no arguments and should return no "

howto/pyporting.po

@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-10 11:27+0200\n"
+"POT-Creation-Date: 2019-12-05 23:16+0100\n"
 "PO-Revision-Date: 2019-10-31 15:33+0100\n"
+"Last-Translator: Loc Cosnier <[email protected]>\n"
 "Language-Team: FRENCH <[email protected]>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Last-Translator: Loc Cosnier <[email protected]>\n"
 "X-Generator: Poedit 2.2.1\n"
 
 #: ../Doc/howto/pyporting.rst:5