Pomerge

.travis.yml

@@ -8,4 +8,4 @@ install:
   - pospell --version
 script:
   - pospell -p dict -l fr_FR **/*.po
-  - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=75a402a
+  - make CPYTHON_CLONE=/tmp/cpython/ COMMIT=d1e71758

c-api/buffer.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 15:29+0200\n"
+"POT-Creation-Date: 2018-12-21 09:48+0100\n"
 "PO-Revision-Date: 2018-10-04 12:18+0200\n"
 "Last-Translator: \n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -336,7 +336,7 @@ msgstr ""
 
 #: ../Doc/c-api/buffer.rst:201
 msgid ""
-"If all suboffsets are negative (i.e. no de-referencing is needed, then this "
+"If all suboffsets are negative (i.e. no de-referencing is needed), then this "
 "field must be NULL (the default value)."
 msgstr ""
 
@@ -619,7 +619,7 @@ msgstr "Fonctions relatives aux tampons"
 msgid ""
 "Return ``1`` if *obj* supports the buffer interface otherwise ``0``.  When "
 "``1`` is returned, it doesn't guarantee that :c:func:`PyObject_GetBuffer` "
-"will succeed."
+"will succeed.  This function always succeeds."
 msgstr ""
 
 #: ../Doc/c-api/buffer.rst:437
@@ -670,7 +670,8 @@ msgstr ""
 msgid ""
 "Return ``1`` if the memory defined by the *view* is C-style (*order* is "
 "``'C'``) or Fortran-style (*order* is ``'F'``) :term:`contiguous` or either "
-"one (*order* is ``'A'``).  Return ``0`` otherwise."
+"one (*order* is ``'A'``).  Return ``0`` otherwise.  This function always "
+"succeeds."
 msgstr ""
 
 #: ../Doc/c-api/buffer.rst:478

c-api/codec.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-02 22:11+0200\n"
+"POT-Creation-Date: 2018-12-21 09:48+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"
@@ -31,7 +31,7 @@ msgstr ""
 #: ../Doc/c-api/codec.rst:15
 msgid ""
 "Return ``1`` or ``0`` depending on whether there is a registered codec for "
-"the given *encoding*."
+"the given *encoding*.  This function always succeeds."
 msgstr ""
 
 #: ../Doc/c-api/codec.rst:20

c-api/dict.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 15:29+0200\n"
+"POT-Creation-Date: 2018-12-21 09:48+0100\n"
 "PO-Revision-Date: 2018-07-03 11:36+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -100,20 +100,34 @@ msgid ""
 "if the key *key* is not present, but *without* setting an exception."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:101
+#: ../Doc/c-api/dict.rst:98
+msgid ""
+"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
+"`__eq__` methods will get suppressed. To get error reporting use :c:func:"
+"`PyDict_GetItemWithError()` instead."
+msgstr ""
+
+#: ../Doc/c-api/dict.rst:105
 msgid ""
 "Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
 "Return *NULL* **with** an exception set if an exception occurred.  Return "
 "*NULL* **without** an exception set if the key wasn't present."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:109
+#: ../Doc/c-api/dict.rst:113
 msgid ""
 "This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
 "type:`const char\\*`, rather than a :c:type:`PyObject\\*`."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:115
+#: ../Doc/c-api/dict.rst:116
+msgid ""
+"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
+"`__eq__` methods and creating a temporary string object will get suppressed. "
+"To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
+msgstr ""
+
+#: ../Doc/c-api/dict.rst:124
 msgid ""
 "This is the same as the Python-level :meth:`dict.setdefault`.  If present, "
 "it returns the value corresponding to *key* from the dictionary *p*.  If the "
@@ -123,29 +137,29 @@ msgid ""
 "the insertion."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:125
+#: ../Doc/c-api/dict.rst:134
 msgid ""
 "Return a :c:type:`PyListObject` containing all the items from the dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:130
+#: ../Doc/c-api/dict.rst:139
 msgid ""
 "Return a :c:type:`PyListObject` containing all the keys from the dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:135
+#: ../Doc/c-api/dict.rst:144
 msgid ""
 "Return a :c:type:`PyListObject` containing all the values from the "
 "dictionary *p*."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:143
+#: ../Doc/c-api/dict.rst:152
 msgid ""
 "Return the number of items in the dictionary.  This is equivalent to "
 "``len(p)`` on a dictionary."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:149
+#: ../Doc/c-api/dict.rst:158
 msgid ""
 "Iterate over all key-value pairs in the dictionary *p*.  The :c:type:"
 "`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -159,18 +173,18 @@ msgid ""
 "structure is sparse, the offsets are not consecutive."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:160
+#: ../Doc/c-api/dict.rst:169
 msgid "For example::"
 msgstr "Par exemple ::"
 
-#: ../Doc/c-api/dict.rst:170
+#: ../Doc/c-api/dict.rst:179
 msgid ""
 "The dictionary *p* should not be mutated during iteration.  It is safe to "
 "modify the values of the keys as you iterate over the dictionary, but only "
 "so long as the set of keys does not change.  For example::"
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:195
+#: ../Doc/c-api/dict.rst:204
 msgid ""
 "Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
 "*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -180,7 +194,7 @@ msgid ""
 "or ``-1`` if an exception was raised."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:205
+#: ../Doc/c-api/dict.rst:214
 msgid ""
 "This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
 "update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -189,7 +203,7 @@ msgid ""
 "exception was raised."
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:214
+#: ../Doc/c-api/dict.rst:223
 msgid ""
 "Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
 "*seq2* must be an iterable object producing iterable objects of length 2, "
@@ -198,6 +212,6 @@ msgid ""
 "if an exception was raised. Equivalent Python (except for the return value)::"
 msgstr ""
 
-#: ../Doc/c-api/dict.rst:229
+#: ../Doc/c-api/dict.rst:238
 msgid "Clear the free list. Return the total number of freed items."
 msgstr ""

c-api/mapping.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 15:29+0200\n"
+"POT-Creation-Date: 2018-12-21 09:48+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"
@@ -65,31 +65,45 @@ msgid ""
 "on failure.  This is equivalent to the Python statement ``del o[key]``."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:66
+#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:70
 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:73
+#: ../Doc/c-api/mapping.rst:63
+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
+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
 msgid ""
 "On success, return a list of the keys in object *o*.  On failure, return "
 "*NULL*."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:76 ../Doc/c-api/mapping.rst:85
-#: ../Doc/c-api/mapping.rst:94
+#: ../Doc/c-api/mapping.rst:84 ../Doc/c-api/mapping.rst:93
+#: ../Doc/c-api/mapping.rst:102
 msgid "Previously, the function returned a list or a tuple."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:82
+#: ../Doc/c-api/mapping.rst:90
 msgid ""
 "On success, return a list of the values in object *o*.  On failure, return "
 "*NULL*."
 msgstr ""
 
-#: ../Doc/c-api/mapping.rst:91
+#: ../Doc/c-api/mapping.rst:99
 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/memory.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-28 15:29+0200\n"
+"POT-Creation-Date: 2018-12-17 21:38+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"
@@ -437,14 +437,18 @@ msgstr ""
 msgid "``pymalloc`` + debug"
 msgstr ""
 
-#: ../Doc/c-api/memory.rst:344 ../Doc/c-api/memory.rst:345
+#: ../Doc/c-api/memory.rst:344
 msgid "Release build, without pymalloc"
 msgstr ""
 
 #: ../Doc/c-api/memory.rst:344
 msgid "``\"malloc\"``"
 msgstr ""
 
+#: ../Doc/c-api/memory.rst:345
+msgid "Debug build, without pymalloc"
+msgstr ""
+
 #: ../Doc/c-api/memory.rst:345
 msgid "``\"malloc_debug\"``"
 msgstr ""

c-api/number.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-04-02 22:11+0200\n"
+"POT-Creation-Date: 2018-12-21 09:48+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"
@@ -280,5 +280,6 @@ msgstr ""
 #: ../Doc/c-api/number.rst:281
 msgid ""
 "Returns ``1`` if *o* is an index integer (has the nb_index slot of  the "
-"tp_as_number structure filled in), and ``0`` otherwise."
+"tp_as_number structure filled in), and ``0`` otherwise. This function always "
+"succeeds."
 msgstr ""

c-api/objbuffer.po

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-12 22:58+0100\n"
+"POT-Creation-Date: 2018-12-21 09:48+0100\n"
 "PO-Revision-Date: 2018-11-30 10:55+0100\n"
 "Last-Translator: Jules Lasne <jules.lasne@gmail.com>\n"
 "Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -78,14 +78,22 @@ msgstr ""
 "`TypeError` en cas d'erreur."
 
 #: ../Doc/c-api/objbuffer.rst:41
+#, fuzzy
 msgid ""
 "Returns ``1`` if *o* supports the single-segment readable buffer interface. "
-"Otherwise returns ``0``."
+"Otherwise returns ``0``.  This function always succeeds."
 msgstr ""
 "Retourne ``1`` si *o* prend en charge l'interface de mémoire tampon lisible "
 "à segment unique. Sinon, renvoie ``0``."
 
-#: ../Doc/c-api/objbuffer.rst:47
+#: ../Doc/c-api/objbuffer.rst:44
+msgid ""
+"Note that this function tries to get and release a buffer, and exceptions "
+"which occur while calling correspoding functions will get suppressed. To get "
+"error reporting use :c:func:`PyObject_GetBuffer()` instead."
+msgstr ""
+
+#: ../Doc/c-api/objbuffer.rst:51
 msgid ""
 "Returns a pointer to a writable memory location.  The *obj* argument must "
 "support the single-segment, character buffer interface.  On success, returns "