Skip to content

Commit f6a64d5

Browse files
JulienPalardJulienPalard
authored
make merge (#1042)
1 parent ccc2e58 commit f6a64d5

28 files changed

+1877
-1702
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ script:
1515
- '[ -n "$CHANGED_FILES" ] && printf -- "- %s\n" $CHANGED_FILES ;:'
1616
- '[ -n "$CHANGED_FILES" ] && powrap --check --quiet $CHANGED_FILES || :'
1717
- '[ -n "$CHANGED_FILES" ] && pospell -p dict -l fr_FR $CHANGED_FILES || :'
18-
- '[ -n "$CHANGED_FILES" ] && make CPYTHON_CLONE=/tmp/cpython/ COMMIT=4d1abedce9422473af2ac78047e55cde73208208 || :'
18+
- '[ -n "$CHANGED_FILES" ] && make CPYTHON_CLONE=/tmp/cpython/ COMMIT=e21aa61e96f8343200e765d119ebe778873a6bf1 || :'

‎c-api/mapping.po‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2019-12-05 23:16+0100\n"
99
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -29,81 +29,81 @@ msgid ""
2929
"Return ``1`` if the object provides mapping protocol or supports slicing, "
3030
"and ``0`` otherwise. Note that it returns ``1`` for Python classes with a :"
3131
"meth:`__getitem__` method since in general case it is impossible to "
32-
"determine what the type of keys it supports. This function always succeeds."
32+
"determine what type of keys it supports. This function always succeeds."
3333
msgstr ""
3434

35-
#: ../Doc/c-api/mapping.rst:26
35+
#: ../Doc/c-api/mapping.rst:25
3636
msgid ""
3737
"Returns the number of keys in object *o* on success, and ``-1`` on failure. "
3838
"This is equivalent to the Python expression ``len(o)``."
3939
msgstr ""
4040

41-
#: ../Doc/c-api/mapping.rst:32
41+
#: ../Doc/c-api/mapping.rst:31
4242
msgid ""
4343
"Return element of *o* corresponding to the string *key* or ``NULL`` on "
4444
"failure. This is the equivalent of the Python expression ``o[key]``. See "
4545
"also :c:func:`PyObject_GetItem`."
4646
msgstr ""
4747

48-
#: ../Doc/c-api/mapping.rst:39
48+
#: ../Doc/c-api/mapping.rst:38
4949
msgid ""
5050
"Map the string *key* to the value *v* in object *o*. Returns ``-1`` on "
5151
"failure. This is the equivalent of the Python statement ``o[key] = v``. See "
5252
"also :c:func:`PyObject_SetItem`."
5353
msgstr ""
5454

55-
#: ../Doc/c-api/mapping.rst:46
55+
#: ../Doc/c-api/mapping.rst:45
5656
msgid ""
5757
"Remove the mapping for the object *key* from the object *o*. Return ``-1`` "
5858
"on failure. This is equivalent to the Python statement ``del o[key]``. This "
5959
"is an alias of :c:func:`PyObject_DelItem`."
6060
msgstr ""
6161

62-
#: ../Doc/c-api/mapping.rst:53
62+
#: ../Doc/c-api/mapping.rst:52
6363
msgid ""
6464
"Remove the mapping for the string *key* from the object *o*. Return ``-1`` "
6565
"on failure. This is equivalent to the Python statement ``del o[key]``."
6666
msgstr ""
6767

68-
#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:70
68+
#: ../Doc/c-api/mapping.rst:58 ../Doc/c-api/mapping.rst:69
6969
msgid ""
7070
"Return ``1`` if the mapping object has the key *key* and ``0`` otherwise. "
7171
"This is equivalent to the Python expression ``key in o``. This function "
7272
"always succeeds."
7373
msgstr ""
7474

75-
#: ../Doc/c-api/mapping.rst:63
75+
#: ../Doc/c-api/mapping.rst:62
7676
msgid ""
7777
"Note that exceptions which occur while calling the :meth:`__getitem__` "
7878
"method will get suppressed. To get error reporting use :c:func:"
7979
"`PyObject_GetItem()` instead."
8080
msgstr ""
8181

82-
#: ../Doc/c-api/mapping.rst:74
82+
#: ../Doc/c-api/mapping.rst:73
8383
msgid ""
8484
"Note that exceptions which occur while calling the :meth:`__getitem__` "
8585
"method and creating a temporary string object will get suppressed. To get "
8686
"error reporting use :c:func:`PyMapping_GetItemString()` instead."
8787
msgstr ""
8888

89-
#: ../Doc/c-api/mapping.rst:81
89+
#: ../Doc/c-api/mapping.rst:80
9090
msgid ""
9191
"On success, return a list of the keys in object *o*. On failure, return "
9292
"``NULL``."
9393
msgstr ""
9494

95-
#: ../Doc/c-api/mapping.rst:84 ../Doc/c-api/mapping.rst:93
96-
#: ../Doc/c-api/mapping.rst:102
95+
#: ../Doc/c-api/mapping.rst:83 ../Doc/c-api/mapping.rst:92
96+
#: ../Doc/c-api/mapping.rst:101
9797
msgid "Previously, the function returned a list or a tuple."
9898
msgstr ""
9999

100-
#: ../Doc/c-api/mapping.rst:90
100+
#: ../Doc/c-api/mapping.rst:89
101101
msgid ""
102102
"On success, return a list of the values in object *o*. On failure, return "
103103
"``NULL``."
104104
msgstr ""
105105

106-
#: ../Doc/c-api/mapping.rst:99
106+
#: ../Doc/c-api/mapping.rst:98
107107
msgid ""
108108
"On success, return a list of the items in object *o*, where each item is a "
109109
"tuple containing a key-value pair. On failure, return ``NULL``."

‎c-api/sys.po‎

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-11-15 23:53+0100\n"
8+
"POT-Creation-Date: 2019-12-05 23:16+0100\n"
99
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -357,7 +357,7 @@ msgstr ""
357357

358358
#: ../Doc/c-api/sys.rst:312
359359
msgid ""
360-
"Raises an auditing event with any active hooks. Returns zero for success and "
360+
"Raise an auditing event with any active hooks. Return zero for success and "
361361
"non-zero with an exception set on failure."
362362
msgstr ""
363363

@@ -378,41 +378,40 @@ msgstr ""
378378

379379
#: ../Doc/c-api/sys.rst:330
380380
msgid ""
381-
"Adds to the collection of active auditing hooks. Returns zero for success "
382-
"and non-zero on failure. If the runtime has been initialized, also sets an "
383-
"error on failure. Hooks added through this API are called for all "
384-
"interpreters created by the runtime."
381+
"Append the callable *hook* to the list of active auditing hooks. Return zero "
382+
"for success and non-zero on failure. If the runtime has been initialized, "
383+
"also set an error on failure. Hooks added through this API are called for "
384+
"all interpreters created by the runtime."
385385
msgstr ""
386386

387-
#: ../Doc/c-api/sys.rst:335
387+
#: ../Doc/c-api/sys.rst:336
388+
msgid ""
389+
"The *userData* pointer is passed into the hook function. Since hook "
390+
"functions may be called from different runtimes, this pointer should not "
391+
"refer directly to Python state."
392+
msgstr ""
393+
394+
#: ../Doc/c-api/sys.rst:340
388395
msgid ""
389396
"This function is safe to call before :c:func:`Py_Initialize`. When called "
390397
"after runtime initialization, existing audit hooks are notified and may "
391398
"silently abort the operation by raising an error subclassed from :class:"
392399
"`Exception` (other errors will not be silenced)."
393400
msgstr ""
394401

395-
#: ../Doc/c-api/sys.rst:340
402+
#: ../Doc/c-api/sys.rst:345
396403
msgid ""
397404
"The hook function is of type :c:type:`int (*)(const char *event, PyObject "
398405
"*args, void *userData)`, where *args* is guaranteed to be a :c:type:"
399406
"`PyTupleObject`. The hook function is always called with the GIL held by the "
400407
"Python interpreter that raised the event."
401408
msgstr ""
402409

403-
#: ../Doc/c-api/sys.rst:345
404-
msgid ""
405-
"The *userData* pointer is passed into the hook function. Since hook "
406-
"functions may be called from different runtimes, this pointer should not "
407-
"refer directly to Python state."
408-
msgstr ""
409-
410-
#: ../Doc/c-api/sys.rst:349
410+
#: ../Doc/c-api/sys.rst:350
411411
msgid ""
412-
"See :pep:`578` for a detailed description of auditing. Functions in the "
413-
"runtime and standard library that raise events include the details in each "
414-
"function's documentation and listed in the :ref:`audit events table <audit-"
415-
"events>`."
412+
"See :pep:`578` for a detailed description of auditing. Functions in the "
413+
"runtime and standard library that raise events are listed in the :ref:`audit "
414+
"events table <audit-events>`. Details are in each function's documentation."
416415
msgstr ""
417416

418417
#: ../Doc/c-api/sys.rst:None
@@ -421,7 +420,7 @@ msgid ""
421420
"arguments."
422421
msgstr ""
423422

424-
#: ../Doc/c-api/sys.rst:356
423+
#: ../Doc/c-api/sys.rst:357
425424
msgid ""
426425
"If the interpreter is initialized, this function raises a auditing event "
427426
"``sys.addaudithook`` with no arguments. If any existing hooks raise an "
@@ -430,11 +429,11 @@ msgid ""
430429
"hook has been added unless they control all existing hooks."
431430
msgstr ""
432431

433-
#: ../Doc/c-api/sys.rst:368
432+
#: ../Doc/c-api/sys.rst:369
434433
msgid "Process Control"
435434
msgstr ""
436435

437-
#: ../Doc/c-api/sys.rst:375
436+
#: ../Doc/c-api/sys.rst:376
438437
msgid ""
439438
"Print a fatal error message and kill the process. No cleanup is performed. "
440439
"This function should only be invoked when a condition is detected that would "
@@ -444,18 +443,18 @@ msgid ""
444443
"file:`core` file."
445444
msgstr ""
446445

447-
#: ../Doc/c-api/sys.rst:389
446+
#: ../Doc/c-api/sys.rst:390
448447
msgid ""
449448
"Exit the current process. This calls :c:func:`Py_FinalizeEx` and then calls "
450449
"the standard C library function ``exit(status)``. If :c:func:"
451450
"`Py_FinalizeEx` indicates an error, the exit status is set to 120."
452451
msgstr ""
453452

454-
#: ../Doc/c-api/sys.rst:393
453+
#: ../Doc/c-api/sys.rst:394
455454
msgid "Errors from finalization no longer ignored."
456455
msgstr ""
457456

458-
#: ../Doc/c-api/sys.rst:403
457+
#: ../Doc/c-api/sys.rst:404
459458
msgid ""
460459
"Register a cleanup function to be called by :c:func:`Py_FinalizeEx`. The "
461460
"cleanup function will be called with no arguments and should return no "

‎howto/pyporting.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-10 11:27+0200\n"
8+
"POT-Creation-Date: 2019-12-05 23:16+0100\n"
99
"PO-Revision-Date: 2019-10-31 15:33+0100\n"
10+
"Last-Translator: Loc Cosnier <loc.cosnier@pm.me>\n"
1011
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
1112
"Language: fr\n"
1213
"MIME-Version: 1.0\n"
1314
"Content-Type: text/plain; charset=UTF-8\n"
1415
"Content-Transfer-Encoding: 8bit\n"
15-
"Last-Translator: Loc Cosnier <loc.cosnier@pm.me>\n"
1616
"X-Generator: Poedit 2.2.1\n"
1717

1818
#: ../Doc/howto/pyporting.rst:5

0 commit comments

Comments
 (0)