Skip to content

Commit 60ab9d3

Browse files
Seluj78Seluj78
authored
Merge pull request #3 from python/3.7
Merge with upstream
2 parents c1fc27f + 527c124 commit 60ab9d3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+3906
-3819
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ install:
88
- pospell --version
99
script:
1010
- pospell -p dict -l fr_FR **/*.po
11-
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=75a402a
11+
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=d1e71758

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,7 @@ progress:
5757

5858
.PHONY: todo
5959
todo:
60-
python3 scripts/todo.py
61-
60+
potodo --github python/python-docs-fr
6261

6362
.PHONY: merge
6463
merge: upgrade_venv
@@ -86,4 +85,4 @@ endif
8685

8786
.PHONY: fuzzy
8887
fuzzy:
89-
for file in *.po */*.po; do echo $$(msgattrib --only-fuzzy --no-obsolete "$$file" | grep -c '#, fuzzy') $$file; done | grep -v ^0 | sort -gr
88+
potodo --github python/python-docs-fr -f

‎TRANSLATORS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ Hervé Sousset
88
Mickaël Bergem
99
Vincent Poulailleau
1010
Jules Lasne
11+
Mathieu Dupuy

‎c-api/buffer.po‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+0100\n"
99
"PO-Revision-Date: 2018-10-04 12:18+0200\n"
1010
"Last-Translator: \n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -336,7 +336,7 @@ msgstr ""
336336

337337
#: ../Doc/c-api/buffer.rst:201
338338
msgid ""
339-
"If all suboffsets are negative (i.e. no de-referencing is needed, then this "
339+
"If all suboffsets are negative (i.e. no de-referencing is needed), then this "
340340
"field must be NULL (the default value)."
341341
msgstr ""
342342

@@ -619,7 +619,7 @@ msgstr "Fonctions relatives aux tampons"
619619
msgid ""
620620
"Return ``1`` if *obj* supports the buffer interface otherwise ``0``. When "
621621
"``1`` is returned, it doesn't guarantee that :c:func:`PyObject_GetBuffer` "
622-
"will succeed."
622+
"will succeed. This function always succeeds."
623623
msgstr ""
624624

625625
#: ../Doc/c-api/buffer.rst:437
@@ -670,7 +670,8 @@ msgstr ""
670670
msgid ""
671671
"Return ``1`` if the memory defined by the *view* is C-style (*order* is "
672672
"``'C'``) or Fortran-style (*order* is ``'F'``) :term:`contiguous` or either "
673-
"one (*order* is ``'A'``). Return ``0`` otherwise."
673+
"one (*order* is ``'A'``). Return ``0`` otherwise. This function always "
674+
"succeeds."
674675
msgstr ""
675676

676677
#: ../Doc/c-api/buffer.rst:478

‎c-api/codec.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2017-04-02 22:11+0200\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+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 <[email protected]>\n"
@@ -31,7 +31,7 @@ msgstr ""
3131
#: ../Doc/c-api/codec.rst:15
3232
msgid ""
3333
"Return ``1`` or ``0`` depending on whether there is a registered codec for "
34-
"the given *encoding*."
34+
"the given *encoding*. This function always succeeds."
3535
msgstr ""
3636

3737
#: ../Doc/c-api/codec.rst:20

‎c-api/dict.po‎

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+0100\n"
99
"PO-Revision-Date: 2018-07-03 11:36+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -100,20 +100,34 @@ msgid ""
100100
"if the key *key* is not present, but *without* setting an exception."
101101
msgstr ""
102102

103-
#: ../Doc/c-api/dict.rst:101
103+
#: ../Doc/c-api/dict.rst:98
104+
msgid ""
105+
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
106+
"`__eq__` methods will get suppressed. To get error reporting use :c:func:"
107+
"`PyDict_GetItemWithError()` instead."
108+
msgstr ""
109+
110+
#: ../Doc/c-api/dict.rst:105
104111
msgid ""
105112
"Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
106113
"Return *NULL* **with** an exception set if an exception occurred. Return "
107114
"*NULL* **without** an exception set if the key wasn't present."
108115
msgstr ""
109116

110-
#: ../Doc/c-api/dict.rst:109
117+
#: ../Doc/c-api/dict.rst:113
111118
msgid ""
112119
"This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
113120
"type:`const char\\*`, rather than a :c:type:`PyObject\\*`."
114121
msgstr ""
115122

116-
#: ../Doc/c-api/dict.rst:115
123+
#: ../Doc/c-api/dict.rst:116
124+
msgid ""
125+
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
126+
"`__eq__` methods and creating a temporary string object will get suppressed. "
127+
"To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
128+
msgstr ""
129+
130+
#: ../Doc/c-api/dict.rst:124
117131
msgid ""
118132
"This is the same as the Python-level :meth:`dict.setdefault`. If present, "
119133
"it returns the value corresponding to *key* from the dictionary *p*. If the "
@@ -123,29 +137,29 @@ msgid ""
123137
"the insertion."
124138
msgstr ""
125139

126-
#: ../Doc/c-api/dict.rst:125
140+
#: ../Doc/c-api/dict.rst:134
127141
msgid ""
128142
"Return a :c:type:`PyListObject` containing all the items from the dictionary."
129143
msgstr ""
130144

131-
#: ../Doc/c-api/dict.rst:130
145+
#: ../Doc/c-api/dict.rst:139
132146
msgid ""
133147
"Return a :c:type:`PyListObject` containing all the keys from the dictionary."
134148
msgstr ""
135149

136-
#: ../Doc/c-api/dict.rst:135
150+
#: ../Doc/c-api/dict.rst:144
137151
msgid ""
138152
"Return a :c:type:`PyListObject` containing all the values from the "
139153
"dictionary *p*."
140154
msgstr ""
141155

142-
#: ../Doc/c-api/dict.rst:143
156+
#: ../Doc/c-api/dict.rst:152
143157
msgid ""
144158
"Return the number of items in the dictionary. This is equivalent to "
145159
"``len(p)`` on a dictionary."
146160
msgstr ""
147161

148-
#: ../Doc/c-api/dict.rst:149
162+
#: ../Doc/c-api/dict.rst:158
149163
msgid ""
150164
"Iterate over all key-value pairs in the dictionary *p*. The :c:type:"
151165
"`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -159,18 +173,18 @@ msgid ""
159173
"structure is sparse, the offsets are not consecutive."
160174
msgstr ""
161175

162-
#: ../Doc/c-api/dict.rst:160
176+
#: ../Doc/c-api/dict.rst:169
163177
msgid "For example::"
164178
msgstr "Par exemple ::"
165179

166-
#: ../Doc/c-api/dict.rst:170
180+
#: ../Doc/c-api/dict.rst:179
167181
msgid ""
168182
"The dictionary *p* should not be mutated during iteration. It is safe to "
169183
"modify the values of the keys as you iterate over the dictionary, but only "
170184
"so long as the set of keys does not change. For example::"
171185
msgstr ""
172186

173-
#: ../Doc/c-api/dict.rst:195
187+
#: ../Doc/c-api/dict.rst:204
174188
msgid ""
175189
"Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
176190
"*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -180,7 +194,7 @@ msgid ""
180194
"or ``-1`` if an exception was raised."
181195
msgstr ""
182196

183-
#: ../Doc/c-api/dict.rst:205
197+
#: ../Doc/c-api/dict.rst:214
184198
msgid ""
185199
"This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
186200
"update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -189,7 +203,7 @@ msgid ""
189203
"exception was raised."
190204
msgstr ""
191205

192-
#: ../Doc/c-api/dict.rst:214
206+
#: ../Doc/c-api/dict.rst:223
193207
msgid ""
194208
"Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
195209
"*seq2* must be an iterable object producing iterable objects of length 2, "
@@ -198,6 +212,6 @@ msgid ""
198212
"if an exception was raised. Equivalent Python (except for the return value)::"
199213
msgstr ""
200214

201-
#: ../Doc/c-api/dict.rst:229
215+
#: ../Doc/c-api/dict.rst:238
202216
msgid "Clear the free list. Return the total number of freed items."
203217
msgstr ""

‎c-api/mapping.po‎

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+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 <[email protected]>\n"
@@ -65,31 +65,45 @@ msgid ""
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:66
68+
#: ../Doc/c-api/mapping.rst:59 ../Doc/c-api/mapping.rst:70
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:73
75+
#: ../Doc/c-api/mapping.rst:63
76+
msgid ""
77+
"Note that exceptions which occur while calling the :meth:`__getitem__` "
78+
"method will get suppressed. To get error reporting use :c:func:"
79+
"`PyObject_GetItem()` instead."
80+
msgstr ""
81+
82+
#: ../Doc/c-api/mapping.rst:74
83+
msgid ""
84+
"Note that exceptions which occur while calling the :meth:`__getitem__` "
85+
"method and creating a temporary string object will get suppressed. To get "
86+
"error reporting use :c:func:`PyMapping_GetItemString()` instead."
87+
msgstr ""
88+
89+
#: ../Doc/c-api/mapping.rst:81
7690
msgid ""
7791
"On success, return a list of the keys in object *o*. On failure, return "
7892
"*NULL*."
7993
msgstr ""
8094

81-
#: ../Doc/c-api/mapping.rst:76 ../Doc/c-api/mapping.rst:85
82-
#: ../Doc/c-api/mapping.rst:94
95+
#: ../Doc/c-api/mapping.rst:84 ../Doc/c-api/mapping.rst:93
96+
#: ../Doc/c-api/mapping.rst:102
8397
msgid "Previously, the function returned a list or a tuple."
8498
msgstr ""
8599

86-
#: ../Doc/c-api/mapping.rst:82
100+
#: ../Doc/c-api/mapping.rst:90
87101
msgid ""
88102
"On success, return a list of the values in object *o*. On failure, return "
89103
"*NULL*."
90104
msgstr ""
91105

92-
#: ../Doc/c-api/mapping.rst:91
106+
#: ../Doc/c-api/mapping.rst:99
93107
msgid ""
94108
"On success, return a list of the items in object *o*, where each item is a "
95109
"tuple containing a key-value pair. On failure, return *NULL*."

‎c-api/memory.po‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2018-12-17 21:38+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 <[email protected]>\n"
@@ -437,14 +437,18 @@ msgstr ""
437437
msgid "``pymalloc`` + debug"
438438
msgstr ""
439439

440-
#: ../Doc/c-api/memory.rst:344 ../Doc/c-api/memory.rst:345
440+
#: ../Doc/c-api/memory.rst:344
441441
msgid "Release build, without pymalloc"
442442
msgstr ""
443443

444444
#: ../Doc/c-api/memory.rst:344
445445
msgid "``\"malloc\"``"
446446
msgstr ""
447447

448+
#: ../Doc/c-api/memory.rst:345
449+
msgid "Debug build, without pymalloc"
450+
msgstr ""
451+
448452
#: ../Doc/c-api/memory.rst:345
449453
msgid "``\"malloc_debug\"``"
450454
msgstr ""

‎c-api/number.po‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2017-04-02 22:11+0200\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+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 <[email protected]>\n"
@@ -280,5 +280,6 @@ msgstr ""
280280
#: ../Doc/c-api/number.rst:281
281281
msgid ""
282282
"Returns ``1`` if *o* is an index integer (has the nb_index slot of the "
283-
"tp_as_number structure filled in), and ``0`` otherwise."
283+
"tp_as_number structure filled in), and ``0`` otherwise. This function always "
284+
"succeeds."
284285
msgstr ""

‎c-api/objbuffer.po‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-12-12 22:58+0100\n"
8+
"POT-Creation-Date: 2018-12-21 09:48+0100\n"
99
"PO-Revision-Date: 2018-11-30 10:55+0100\n"
1010
"Last-Translator: Jules Lasne <[email protected]>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -78,14 +78,22 @@ msgstr ""
7878
"`TypeError` en cas d'erreur."
7979

8080
#: ../Doc/c-api/objbuffer.rst:41
81+
#, fuzzy
8182
msgid ""
8283
"Returns ``1`` if *o* supports the single-segment readable buffer interface. "
83-
"Otherwise returns ``0``."
84+
"Otherwise returns ``0``. This function always succeeds."
8485
msgstr ""
8586
"Retourne ``1`` si *o* prend en charge l'interface de mémoire tampon lisible "
8687
"à segment unique. Sinon, renvoie ``0``."
8788

88-
#: ../Doc/c-api/objbuffer.rst:47
89+
#: ../Doc/c-api/objbuffer.rst:44
90+
msgid ""
91+
"Note that this function tries to get and release a buffer, and exceptions "
92+
"which occur while calling correspoding functions will get suppressed. To get "
93+
"error reporting use :c:func:`PyObject_GetBuffer()` instead."
94+
msgstr ""
95+
96+
#: ../Doc/c-api/objbuffer.rst:51
8997
msgid ""
9098
"Returns a pointer to a writable memory location. The *obj* argument must "
9199
"support the single-segment, character buffer interface. On success, returns "

0 commit comments

Comments
 (0)