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

Skip to content

Commit fbd7777

Browse files
deronnaxderonnax
committed
Merge branch '3.8' into modif_unicode
2 parents 67f2df7 + 11e1c01 commit fbd7777

File tree

267 files changed

+8269
-6103
lines changed

Some content is hidden

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

267 files changed

+8269
-6103
lines changed

‎CONTRIBUTING.rst

Lines changed: 132 additions & 106 deletions
Large diffs are not rendered by default.

‎Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
# from which we generated our po files. We use it here so when we
2222
# test build, we're building with the .rst files that generated our
2323
# .po files.
24-
CPYTHON_CURRENT_COMMIT := e21aa61e96f8343200e765d119ebe778873a6bf1
24+
CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
2525

2626
CPYTHON_PATH := ../cpython/
2727

@@ -99,7 +99,7 @@ serve:
9999

100100
.PHONY: progress
101101
progress:
102-
@python3 -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \
102+
@$(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \
103103
$(shell msgcat *.po */*.po | msgattrib --translated | grep -c '^msgid') \
104104
$(shell msgcat *.po */*.po | grep -c '^msgid')
105105

@@ -157,6 +157,7 @@ merge: setup
157157
sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile
158158
rm -fr $(WORKTREES)/$(BRANCH)
159159
git -C $(CPYTHON_PATH) worktree prune
160+
echo 'To add, you can use git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done'
160161

161162
.PHONY: clean
162163
clean:

‎README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ Comment contribuer
4242

4343
Vous pouvez contribuer :
4444

45-
- en proposant des *pull requests* Github (solution recommandée),
46-
- ou en envoyant un patch à la liste `traductions <https://lists.afpy.org/mailman/listinfo/traductions>`_.
45+
- en proposant des *pull requests* Github (solution recommandée) ;
46+
- en envoyant un patch à la liste `traductions <https://lists.afpy.org/mailman/listinfo/traductions>`_.
4747

4848
Un guide pour contribuer au projet via Github se trouve dans
4949
`CONTRIBUTING.rst
@@ -70,4 +70,4 @@ l'`AFPy <https://www.afpy.org/>`_. En 2017 ce projet est devenu la
7070
traduction officielle de la documentation Python en français grâce à
7171
la `PEP 545 <https://www.python.org/dev/peps/pep-0545/>`_. `Jules Lasne
7272
<https://github.com/Seluj78>`_ à publié fin 2019 une `vidéo de
73-
l'histore du repo <https://youtu.be/azXmvpEJMhU>`_.
73+
l'histoire du dépôt <https://youtu.be/azXmvpEJMhU>`_.

‎c-api/arg.po

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,18 +584,22 @@ msgid "``L`` (:class:`int`) [long long]"
584584
msgstr "``L`` (:class:`int`) [``long long``]"
585585

586586
#: ../Doc/c-api/arg.rst:285
587+
#, fuzzy
587588
msgid "Convert a Python integer to a C :c:type:`long long`."
588-
msgstr ""
589+
msgstr "Convertit un entier Python en un :c:type:`long int`."
589590

590591
#: ../Doc/c-api/arg.rst:289 ../Doc/c-api/arg.rst:615
591592
msgid "``K`` (:class:`int`) [unsigned long long]"
592593
msgstr "``K`` (:class:`int`) [``unsigned long long``]"
593594

594595
#: ../Doc/c-api/arg.rst:288
596+
#, fuzzy
595597
msgid ""
596598
"Convert a Python integer to a C :c:type:`unsigned long long` without "
597599
"overflow checking."
598600
msgstr ""
601+
"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
602+
"le débordement."
599603

600604
#: ../Doc/c-api/arg.rst:292 ../Doc/c-api/arg.rst:618
601605
msgid "``n`` (:class:`int`) [Py_ssize_t]"
@@ -1076,8 +1080,9 @@ msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
10761080
msgstr "``U#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
10771081

10781082
#: ../Doc/c-api/arg.rst:588
1083+
#, fuzzy
10791084
msgid "Convert a plain C :c:type:`int` to a Python integer object."
1080-
msgstr ""
1085+
msgstr "Convertit un :c:type:`long int` en un *int* Python."
10811086

10821087
#: ../Doc/c-api/arg.rst:591
10831088
msgid "``b`` (:class:`int`) [char]"
@@ -1104,16 +1109,18 @@ msgid "Convert a C :c:type:`unsigned short int` to a Python integer object."
11041109
msgstr ""
11051110

11061111
#: ../Doc/c-api/arg.rst:606
1112+
#, fuzzy
11071113
msgid "Convert a C :c:type:`unsigned int` to a Python integer object."
1108-
msgstr ""
1114+
msgstr "Convertit un :c:type:`long int` en un *int* Python."
11091115

11101116
#: ../Doc/c-api/arg.rst:609
11111117
msgid "Convert a C :c:type:`unsigned long` to a Python integer object."
11121118
msgstr ""
11131119

11141120
#: ../Doc/c-api/arg.rst:612
1121+
#, fuzzy
11151122
msgid "Convert a C :c:type:`long long` to a Python integer object."
1116-
msgstr ""
1123+
msgstr "Convertit un :c:type:`long int` en un *int* Python."
11171124

11181125
#: ../Doc/c-api/arg.rst:615
11191126
msgid "Convert a C :c:type:`unsigned long long` to a Python integer object."

‎c-api/bytes.po

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,26 +25,37 @@ msgid ""
2525
msgstr ""
2626

2727
#: ../Doc/c-api/bytes.rst:16
28+
#, fuzzy
2829
msgid "This subtype of :c:type:`PyObject` represents a Python bytes object."
2930
msgstr ""
31+
"Ce sous-type de :c:type:`PyObject` représente un objet ``bytearray`` Python."
3032

3133
#: ../Doc/c-api/bytes.rst:21
34+
#, fuzzy
3235
msgid ""
3336
"This instance of :c:type:`PyTypeObject` represents the Python bytes type; it "
3437
"is the same object as :class:`bytes` in the Python layer."
3538
msgstr ""
39+
"Cette instance de :c:type:`PyTypeObject` représente le type Python "
40+
"*bytearray*, c'est le même que :class:`bytearray` côté Python."
3641

3742
#: ../Doc/c-api/bytes.rst:27
43+
#, fuzzy
3844
msgid ""
3945
"Return true if the object *o* is a bytes object or an instance of a subtype "
4046
"of the bytes type."
4147
msgstr ""
48+
"Renvoie vrai si l'objet *o* est un ``bytearray`` ou une instance d'un sous-"
49+
"type du type ``bytearray``."
4250

4351
#: ../Doc/c-api/bytes.rst:33
52+
#, fuzzy
4453
msgid ""
4554
"Return true if the object *o* is a bytes object, but not an instance of a "
4655
"subtype of the bytes type."
4756
msgstr ""
57+
"Renvoie vrai si l'objet *o* est un ``bytearray``, mais pas une instance d'un "
58+
"sous-type du type ``bytearray``."
4859

4960
#: ../Doc/c-api/bytes.rst:39
5061
msgid ""
@@ -72,15 +83,16 @@ msgstr ""
7283

7384
#: ../Doc/c-api/bytes.rst:68
7485
msgid "Format Characters"
75-
msgstr ""
86+
msgstr "Caractères de format"
7687

7788
#: ../Doc/c-api/bytes.rst:68
7889
msgid "Type"
7990
msgstr "Type"
8091

8192
#: ../Doc/c-api/bytes.rst:68
93+
#, fuzzy
8294
msgid "Comment"
83-
msgstr ""
95+
msgstr "Commentaires"
8496

8597
#: ../Doc/c-api/bytes.rst:70
8698
msgid ":attr:`%%`"

‎c-api/code.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\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2020-02-04 10:00+0100\n"
99
"PO-Revision-Date: 2018-02-15 00:30+0100\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -67,7 +67,7 @@ msgstr ""
6767
#: ../Doc/c-api/code.rst:45
6868
msgid ""
6969
"Similar to :c:func:`PyCode_New`, but with an extra \"posonlyargcount\" for "
70-
"positonal-only arguments."
70+
"positional-only arguments."
7171
msgstr ""
7272

7373
#: ../Doc/c-api/code.rst:51

‎c-api/dict.po

Lines changed: 33 additions & 25 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: 2020-02-04 10:00+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"
@@ -19,15 +19,21 @@ msgid "Dictionary Objects"
1919
msgstr "Objets dictionnaires"
2020

2121
#: ../Doc/c-api/dict.rst:13
22+
#, fuzzy
2223
msgid ""
2324
"This subtype of :c:type:`PyObject` represents a Python dictionary object."
2425
msgstr ""
26+
"Ce sous-type de :c:type:`PyObject` représente un objet ``bytearray`` Python."
2527

2628
#: ../Doc/c-api/dict.rst:18
29+
#, fuzzy
2730
msgid ""
2831
"This instance of :c:type:`PyTypeObject` represents the Python dictionary "
2932
"type. This is the same object as :class:`dict` in the Python layer."
3033
msgstr ""
34+
"Cette instance de l'objet :c:type:`PyTypeObject` représente le type nombre à "
35+
"virgule flottante en Python. C'est le même objet que la classe :class:"
36+
"`float` de la couche Python."
3137

3238
#: ../Doc/c-api/dict.rst:24
3339
msgid ""
@@ -69,65 +75,67 @@ msgstr ""
6975

7076
#: ../Doc/c-api/dict.rst:65
7177
msgid ""
72-
"Insert *value* into the dictionary *p* with a key of *key*. *key* must be :"
78+
"Insert *val* into the dictionary *p* with a key of *key*. *key* must be :"
7379
"term:`hashable`; if it isn't, :exc:`TypeError` will be raised. Return ``0`` "
74-
"on success or ``-1`` on failure."
80+
"on success or ``-1`` on failure. This function *does not* steal a reference "
81+
"to *val*."
7582
msgstr ""
7683

77-
#: ../Doc/c-api/dict.rst:74
84+
#: ../Doc/c-api/dict.rst:75
7885
msgid ""
79-
"Insert *value* into the dictionary *p* using *key* as a key. *key* should be "
86+
"Insert *val* into the dictionary *p* using *key* as a key. *key* should be "
8087
"a :c:type:`const char\\*`. The key object is created using "
81-
"``PyUnicode_FromString(key)``. Return ``0`` on success or ``-1`` on failure."
88+
"``PyUnicode_FromString(key)``. Return ``0`` on success or ``-1`` on "
89+
"failure. This function *does not* steal a reference to *val*."
8290
msgstr ""
8391

84-
#: ../Doc/c-api/dict.rst:82
92+
#: ../Doc/c-api/dict.rst:83
8593
msgid ""
8694
"Remove the entry in dictionary *p* with key *key*. *key* must be hashable; "
8795
"if it isn't, :exc:`TypeError` is raised. Return ``0`` on success or ``-1`` "
8896
"on failure."
8997
msgstr ""
9098

91-
#: ../Doc/c-api/dict.rst:89
99+
#: ../Doc/c-api/dict.rst:90
92100
msgid ""
93101
"Remove the entry in dictionary *p* which has a key specified by the string "
94102
"*key*. Return ``0`` on success or ``-1`` on failure."
95103
msgstr ""
96104

97-
#: ../Doc/c-api/dict.rst:95
105+
#: ../Doc/c-api/dict.rst:96
98106
msgid ""
99107
"Return the object from dictionary *p* which has a key *key*. Return "
100108
"``NULL`` if the key *key* is not present, but *without* setting an exception."
101109
msgstr ""
102110

103-
#: ../Doc/c-api/dict.rst:98
111+
#: ../Doc/c-api/dict.rst:99
104112
msgid ""
105113
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
106114
"`__eq__` methods will get suppressed. To get error reporting use :c:func:"
107115
"`PyDict_GetItemWithError()` instead."
108116
msgstr ""
109117

110-
#: ../Doc/c-api/dict.rst:105
118+
#: ../Doc/c-api/dict.rst:106
111119
msgid ""
112120
"Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
113121
"Return ``NULL`` **with** an exception set if an exception occurred. Return "
114122
"``NULL`` **without** an exception set if the key wasn't present."
115123
msgstr ""
116124

117-
#: ../Doc/c-api/dict.rst:113
125+
#: ../Doc/c-api/dict.rst:114
118126
msgid ""
119127
"This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
120128
"type:`const char\\*`, rather than a :c:type:`PyObject\\*`."
121129
msgstr ""
122130

123-
#: ../Doc/c-api/dict.rst:116
131+
#: ../Doc/c-api/dict.rst:117
124132
msgid ""
125133
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
126134
"`__eq__` methods and creating a temporary string object will get suppressed. "
127135
"To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
128136
msgstr ""
129137

130-
#: ../Doc/c-api/dict.rst:124
138+
#: ../Doc/c-api/dict.rst:125
131139
msgid ""
132140
"This is the same as the Python-level :meth:`dict.setdefault`. If present, "
133141
"it returns the value corresponding to *key* from the dictionary *p*. If the "
@@ -137,29 +145,29 @@ msgid ""
137145
"the insertion."
138146
msgstr ""
139147

140-
#: ../Doc/c-api/dict.rst:134
148+
#: ../Doc/c-api/dict.rst:135
141149
msgid ""
142150
"Return a :c:type:`PyListObject` containing all the items from the dictionary."
143151
msgstr ""
144152

145-
#: ../Doc/c-api/dict.rst:139
153+
#: ../Doc/c-api/dict.rst:140
146154
msgid ""
147155
"Return a :c:type:`PyListObject` containing all the keys from the dictionary."
148156
msgstr ""
149157

150-
#: ../Doc/c-api/dict.rst:144
158+
#: ../Doc/c-api/dict.rst:145
151159
msgid ""
152160
"Return a :c:type:`PyListObject` containing all the values from the "
153161
"dictionary *p*."
154162
msgstr ""
155163

156-
#: ../Doc/c-api/dict.rst:152
164+
#: ../Doc/c-api/dict.rst:153
157165
msgid ""
158166
"Return the number of items in the dictionary. This is equivalent to "
159167
"``len(p)`` on a dictionary."
160168
msgstr ""
161169

162-
#: ../Doc/c-api/dict.rst:158
170+
#: ../Doc/c-api/dict.rst:159
163171
msgid ""
164172
"Iterate over all key-value pairs in the dictionary *p*. The :c:type:"
165173
"`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -173,18 +181,18 @@ msgid ""
173181
"structure is sparse, the offsets are not consecutive."
174182
msgstr ""
175183

176-
#: ../Doc/c-api/dict.rst:169
184+
#: ../Doc/c-api/dict.rst:170
177185
msgid "For example::"
178186
msgstr "Par exemple ::"
179187

180-
#: ../Doc/c-api/dict.rst:179
188+
#: ../Doc/c-api/dict.rst:180
181189
msgid ""
182190
"The dictionary *p* should not be mutated during iteration. It is safe to "
183191
"modify the values of the keys as you iterate over the dictionary, but only "
184192
"so long as the set of keys does not change. For example::"
185193
msgstr ""
186194

187-
#: ../Doc/c-api/dict.rst:204
195+
#: ../Doc/c-api/dict.rst:205
188196
msgid ""
189197
"Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
190198
"*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -194,7 +202,7 @@ msgid ""
194202
"or ``-1`` if an exception was raised."
195203
msgstr ""
196204

197-
#: ../Doc/c-api/dict.rst:214
205+
#: ../Doc/c-api/dict.rst:215
198206
msgid ""
199207
"This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
200208
"update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -203,7 +211,7 @@ msgid ""
203211
"exception was raised."
204212
msgstr ""
205213

206-
#: ../Doc/c-api/dict.rst:223
214+
#: ../Doc/c-api/dict.rst:224
207215
msgid ""
208216
"Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
209217
"*seq2* must be an iterable object producing iterable objects of length 2, "
@@ -212,6 +220,6 @@ msgid ""
212220
"if an exception was raised. Equivalent Python (except for the return value)::"
213221
msgstr ""
214222

215-
#: ../Doc/c-api/dict.rst:238
223+
#: ../Doc/c-api/dict.rst:239
216224
msgid "Clear the free list. Return the total number of freed items."
217225
msgstr ""

‎c-api/exceptions.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1041,8 +1041,9 @@ msgid ":exc:`MemoryError`"
10411041
msgstr ":exc:`MemoryError`"
10421042

10431043
#: ../Doc/c-api/exceptions.rst:879
1044+
#, fuzzy
10441045
msgid ":c:data:`PyExc_ModuleNotFoundError`"
1045-
msgstr ""
1046+
msgstr ":c:data:`PyExc_ModuleNotFoundError`."
10461047

10471048
#: ../Doc/c-api/exceptions.rst:879
10481049
msgid ":exc:`ModuleNotFoundError`"

‎c-api/import.po

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,11 @@ msgid ""
290290
"could play tricks with this to provide a dynamically created collection of "
291291
"frozen modules."
292292
msgstr ""
293+
"Ce pointeur est initialisé de manière à pointer sur un tableau d'entrées de :"
294+
"c:type:`struct _frozen`, dont tous les membres de la dernière valent "
295+
"``NULL`` ou zéro. Quand un module gelé est importé, il est cherché dans ce "
296+
"tableau. Du code tiers peut jouer avec pour construire dynamiquement une "
297+
"collection de module gelés."
293298

294299
#: ../Doc/c-api/import.rst:287
295300
msgid ""

0 commit comments

Comments
 (0)