Skip to content

Commit 2abbffc

Browse files
deronnaxderonnax
committed
Merge branch '3.8' into whatsnew-3.8
2 parents e004767 + 00a0972 commit 2abbffc

Some content is hidden

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

105 files changed

+10888
-9336
lines changed

‎CONTRIBUTING.rst‎

Lines changed: 208 additions & 99 deletions
Large diffs are not rendered by default.

‎Makefile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@
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 := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
24+
CPYTHON_CURRENT_COMMIT := dc3239177ff26cb6a12e437a1f507be730fe8ba7
2525

2626
CPYTHON_PATH := ../cpython/
2727

2828
LANGUAGE := fr
2929
BRANCH := 3.8
3030

31+
.SILENT:
3132

3233
# Internal variables
3334

@@ -43,7 +44,7 @@ JOBS := auto
4344
.PHONY: all
4445
all: setup
4546
mkdir -p $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/
46-
cp --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/
47+
cp -uv --parents *.po */*.po $(WORKTREE)/locales/$(LANGUAGE)/LC_MESSAGES/ | cut -d"'" -f2
4748
$(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) \
4849
SPHINXOPTS='-qW -j$(JOBS) \
4950
-D locale_dirs=../locales \
@@ -86,9 +87,9 @@ setup: venv
8687

8788
.PHONY: venv
8889
venv:
89-
@if [ ! -d $(VENV) ]; then $(PYTHON) -m venv --prompt python-docs-fr $(VENV); fi
90-
@$(VENV)/bin/python -m pip install -q -r requirements.txt 2> $(VENV)/pip-install.log
91-
@if grep -q 'pip install --upgrade pip' $(VENV)/pip-install.log; then \
90+
if [ ! -d $(VENV) ]; then $(PYTHON) -m venv --prompt python-docs-fr $(VENV); fi
91+
$(VENV)/bin/python -m pip install -q -r requirements.txt 2> $(VENV)/pip-install.log
92+
if grep -q 'pip install --upgrade pip' $(VENV)/pip-install.log; then \
9293
$(VENV)/bin/pip install -q --upgrade pip; \
9394
fi
9495

@@ -100,7 +101,7 @@ serve:
100101

101102
.PHONY: progress
102103
progress:
103-
@$(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \
104+
$(PYTHON) -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))' \
104105
$(shell msgcat *.po */*.po | msgattrib --translated | grep -c '^msgid') \
105106
$(shell msgcat *.po */*.po | grep -c '^msgid')
106107

@@ -121,9 +122,9 @@ DESTS = $(addprefix $(POSPELL_TMP_DIR)/,$(addsuffix .out,$(SRCS)))
121122
spell: venv $(DESTS)
122123

123124
$(POSPELL_TMP_DIR)/%.po.out: %.po dict
124-
@echo "Checking $<..."
125-
@mkdir -p $(@D)
126-
@$(VENV)/bin/pospell -p dict -l fr_FR $< && touch $@
125+
echo "Checking $<..."
126+
mkdir -p $(@D)
127+
$(VENV)/bin/pospell -p dict -l fr_FR $< && touch $@
127128

128129
.PHONY: fuzzy
129130
fuzzy: venv
@@ -162,5 +163,5 @@ merge: setup
162163

163164
.PHONY: clean
164165
clean:
165-
rm -fr venv $(POSPELL_TMP_DIR)
166+
rm -fr $(VENV) $(POSPELL_TMP_DIR)
166167
find -name '*.mo' -delete

‎README.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ Comment contribuer
4343
Vous pouvez contribuer :
4444

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

48-
Un guide pour contribuer au projet via Github se trouve dans
49-
`CONTRIBUTING.rst
50-
<https://github.com/python/python-docs-fr/blob/3.8/CONTRIBUTING.rst>`_.
48+
Consultez le
49+
`guide <https://github.com/python/python-docs-fr/blob/3.8/CONTRIBUTING.rst>`_
50+
pour apprendre les conventions à respecter.
5151

5252

5353
Où obtenir de l'aide ?
@@ -56,8 +56,8 @@ Où obtenir de l'aide ?
5656
Le coordinateur de cette traduction est `Julien Palard <https://mdk.fr/>`_.
5757

5858
N'hésitez pas à poser vos questions sur le canal ``#python-fr`` sur `freenode
59-
<https://kiwi.freenode.net/>`_ (ne nécessite pas d'inscription) ou sur la
60-
`liste de diffusion des traductions de l'AFPy <https://lists.afpy.org/mailman/listinfo/traductions>`_.
59+
<https://kiwi.freenode.net/>`_ (ne nécessite pas d'inscription) ou par la
60+
`liste de diffusion <https://lists.afpy.org/mailman/listinfo/traductions>`_ des traductions de l'AFPy.
6161

6262

6363
Historique du projet
@@ -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'histoire du dépôt <https://youtu.be/azXmvpEJMhU>`_.
73+
l'histoire du dépôt <https://youtu.be/azXmvpEJMhU>`_.

‎c-api/arg.po‎

Lines changed: 56 additions & 18 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-05-23 11:38+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -254,13 +254,13 @@ msgstr ""
254254
"membre ``buf``, dont la structure est :c:type:`Py_buffer` est fixée à *NULL*."
255255

256256
#: ../Doc/c-api/arg.rst:110
257+
#, fuzzy
257258
msgid ""
258259
"``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
259-
"[const char \\*, int]"
260+
"[const char \\*, int or :c:type:`Py_ssize_t`]"
260261
msgstr ""
261-
"``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
262-
"<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
263-
"entier]"
262+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
263+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
264264

265265
#: ../Doc/c-api/arg.rst:109
266266
#, fuzzy
@@ -308,10 +308,13 @@ msgid ""
308308
msgstr ""
309309

310310
#: ../Doc/c-api/arg.rst:129
311-
msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
311+
#, fuzzy
312+
msgid ""
313+
"``y#`` (read-only :term:`bytes-like object`) [const char \\*, int or :c:type:"
314+
"`Py_ssize_t`]"
312315
msgstr ""
313-
"``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
314-
"<bytes-like object>`) [constante char \\*, entier]"
316+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
317+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
315318

316319
#: ../Doc/c-api/arg.rst:128
317320
msgid ""
@@ -378,7 +381,9 @@ msgid ""
378381
msgstr ""
379382

380383
#: ../Doc/c-api/arg.rst:165
381-
msgid "``u#`` (:class:`str`) [const Py_UNICODE \\*, int]"
384+
#, fuzzy
385+
msgid ""
386+
"``u#`` (:class:`str`) [const Py_UNICODE \\*, int or :c:type:`Py_ssize_t`]"
382387
msgstr "``u#`` (:class:`str`) [``const Py_UNICODE *``, ``int``]"
383388

384389
#: ../Doc/c-api/arg.rst:159
@@ -402,7 +407,10 @@ msgstr ""
402407
"pointeur :c:type:`Py_UNICODE` vaut *NULL*."
403408

404409
#: ../Doc/c-api/arg.rst:181
405-
msgid "``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int]"
410+
#, fuzzy
411+
msgid ""
412+
"``Z#`` (:class:`str` or ``None``) [const Py_UNICODE \\*, int or :c:type:"
413+
"`Py_ssize_t`]"
406414
msgstr "``Z#`` (:class:`str` ou ``None``) [``const Py_UNICODE *``, ``int``]"
407415

408416
#: ../Doc/c-api/arg.rst:176
@@ -481,10 +489,13 @@ msgid ""
481489
msgstr ""
482490

483491
#: ../Doc/c-api/arg.rst:245
492+
#, fuzzy
484493
msgid ""
485-
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int "
486-
"\\*buffer_length]"
494+
"``es#`` (:class:`str`) [const char \\*encoding, char \\*\\*buffer, int or :c:"
495+
"type:`Py_ssize_t` \\*buffer_length]"
487496
msgstr ""
497+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
498+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
488499

489500
#: ../Doc/c-api/arg.rst:217
490501
msgid ""
@@ -537,10 +548,13 @@ msgstr ""
537548
"sans l'octet NUL de fin."
538549

539550
#: ../Doc/c-api/arg.rst:250
551+
#, fuzzy
540552
msgid ""
541553
"``et#`` (:class:`str`, :class:`bytes` or :class:`bytearray`) [const char "
542-
"\\*encoding, char \\*\\*buffer, int \\*buffer_length]"
554+
"\\*encoding, char \\*\\*buffer, int or :c:type:`Py_ssize_t` \\*buffer_length]"
543555
msgstr ""
556+
"``s#`` (:class:`str`, :term:`bytes-like object` en lecture seule) [``const "
557+
"char \\*``, ``int`` ou :c:type:`Py_ssize_t`]"
544558

545559
#: ../Doc/c-api/arg.rst:248
546560
msgid ""
@@ -1065,7 +1079,10 @@ msgid ""
10651079
msgstr ""
10661080

10671081
#: ../Doc/c-api/arg.rst:555
1068-
msgid "``s#`` (:class:`str` or ``None``) [const char \\*, int]"
1082+
#, fuzzy
1083+
msgid ""
1084+
"``s#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1085+
"`Py_ssize_t`]"
10691086
msgstr "``s#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
10701087

10711088
#: ../Doc/c-api/arg.rst:553
@@ -1086,7 +1103,8 @@ msgid ""
10861103
msgstr ""
10871104

10881105
#: ../Doc/c-api/arg.rst:563
1089-
msgid "``y#`` (:class:`bytes`) [const char \\*, int]"
1106+
#, fuzzy
1107+
msgid "``y#`` (:class:`bytes`) [const char \\*, int or :c:type:`Py_ssize_t`]"
10901108
msgstr "``y#`` (:class:`bytes`) [``const char *, int``]"
10911109

10921110
#: ../Doc/c-api/arg.rst:562
@@ -1100,7 +1118,10 @@ msgid "Same as ``s``."
11001118
msgstr ""
11011119

11021120
#: ../Doc/c-api/arg.rst:569
1103-
msgid "``z#`` (:class:`str` or ``None``) [const char \\*, int]"
1121+
#, fuzzy
1122+
msgid ""
1123+
"``z#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1124+
"`Py_ssize_t`]"
11041125
msgstr "``z#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
11051126

11061127
#: ../Doc/c-api/arg.rst:569 ../Doc/c-api/arg.rst:585
@@ -1119,7 +1140,8 @@ msgid ""
11191140
msgstr ""
11201141

11211142
#: ../Doc/c-api/arg.rst:579
1122-
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int]"
1143+
#, fuzzy
1144+
msgid "``u#`` (:class:`str`) [const wchar_t \\*, int or :c:type:`Py_ssize_t`]"
11231145
msgstr "``u#`` (:class:`str`) [``const wchar_t *``, ``int``]"
11241146

11251147
#: ../Doc/c-api/arg.rst:577
@@ -1134,7 +1156,10 @@ msgid "``U`` (:class:`str` or ``None``) [const char \\*]"
11341156
msgstr "``U`` (:class:`str` ou ``None``) [``const char *``]"
11351157

11361158
#: ../Doc/c-api/arg.rst:585
1137-
msgid "``U#`` (:class:`str` or ``None``) [const char \\*, int]"
1159+
#, fuzzy
1160+
msgid ""
1161+
"``U#`` (:class:`str` or ``None``) [const char \\*, int or :c:type:"
1162+
"`Py_ssize_t`]"
11381163
msgstr "``U#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
11391164

11401165
#: ../Doc/c-api/arg.rst:588
@@ -1296,6 +1321,19 @@ msgid ""
12961321
"rather than a variable number of arguments."
12971322
msgstr ""
12981323

1324+
#~ msgid ""
1325+
#~ "``z#`` (:class:`str`, read-only :term:`bytes-like object` or ``None``) "
1326+
#~ "[const char \\*, int]"
1327+
#~ msgstr ""
1328+
#~ "``z#`` (:class:`str`, :term:`objet compatible avec une chaîne d'octets "
1329+
#~ "<bytes-like object>` en lecture seule ou ``None``) [constante char \\*, "
1330+
#~ "entier]"
1331+
1332+
#~ msgid "``y#`` (read-only :term:`bytes-like object`) [const char \\*, int]"
1333+
#~ msgstr ""
1334+
#~ "``y#`` (lecture seule :term:`objet compatible avec une chaîne d'octets "
1335+
#~ "<bytes-like object>`) [constante char \\*, entier]"
1336+
12991337
#~ msgid "``s`` (:class:`str` or ``None``) [char \\*]"
13001338
#~ msgstr "``s`` (:class:`str` ou ``None``) [char \\*]"
13011339

0 commit comments

Comments
 (0)