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

Skip to content

Commit 262421d

Browse files
committed
make merge from cpython 3.9
1 parent a512341 commit 262421d

File tree

275 files changed

+21616
-17982
lines changed

Some content is hidden

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

275 files changed

+21616
-17982
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
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 := cdb015b7ed58ee2babf552001374c278219854e1
24+
CPYTHON_CURRENT_COMMIT := 760552ceb8c5f5ca4f1bf13f47543b42b25e0b83
2525

2626
CPYTHON_PATH := ../cpython/
2727

@@ -177,6 +177,7 @@ merge: setup
177177
msgcat -o "$$PO" "$$POT";\
178178
fi\
179179
done
180+
echo "Replacing CPYTHON_CURRENT_COMMIT Makefile by: " $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)
180181
sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile
181182
rm -fr $(WORKTREES)/$(BRANCH)
182183
git -C $(CPYTHON_PATH) worktree prune

c-api/arg.po

Lines changed: 22 additions & 22 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: 2020-05-23 11:38+0200\n"
8+
"POT-Creation-Date: 2020-07-20 10:51+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:14+0200\n"
1010
"Last-Translator: Julien Palard <[email protected]>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -180,7 +180,7 @@ msgstr ""
180180
"est préférable d'utiliser le format ``O&`` avec :c:func:"
181181
"`PyUnicode_FSConverter` en tant que *converter*."
182182

183-
#: c-api/arg.rst:150
183+
#: c-api/arg.rst:83 c-api/arg.rst:150
184184
msgid ""
185185
"Previously, :exc:`TypeError` was raised when embedded null code points were "
186186
"encountered in the Python string."
@@ -226,7 +226,7 @@ msgstr ""
226226
"caractères peut contenir des octets NULL. Les objets Unicode sont convertis "
227227
"vers des chaînes de caractères C utilisant l'encodage ``'utf-8'``."
228228

229-
#: c-api/arg.rst:566
229+
#: c-api/arg.rst:102 c-api/arg.rst:566
230230
msgid "``z`` (:class:`str` or ``None``) [const char \\*]"
231231
msgstr "``z`` (:class:`str` ou ``None``) [``const char *``]"
232232

@@ -373,7 +373,7 @@ msgstr ""
373373
"chaîne de caractères Python ne doit pas contenir de code *NULL*. Si elle en "
374374
"contient, une exception :exc:`ValueError` est levée."
375375

376-
#: c-api/arg.rst:174 c-api/arg.rst:182
376+
#: c-api/arg.rst:157 c-api/arg.rst:166 c-api/arg.rst:174 c-api/arg.rst:182
377377
msgid ""
378378
"Part of the old-style :c:type:`Py_UNICODE` API; please migrate to using :c:"
379379
"func:`PyUnicode_AsWideCharString`."
@@ -578,7 +578,7 @@ msgstr ""
578578
"Convertit un entier Python positif ou nul en un ``unsigned tiny int``, "
579579
"stocké dans un :c:type:`unsigned char` C."
580580

581-
#: c-api/arg.rst:600
581+
#: c-api/arg.rst:261 c-api/arg.rst:600
582582
msgid "``B`` (:class:`int`) [unsigned char]"
583583
msgstr "``B`` (:class:`int`) [``unsigned char``]"
584584

@@ -590,15 +590,15 @@ msgstr ""
590590
"Convertit un entier Python en un ``tiny int`` sans vérifier le débordement, "
591591
"stocké dans un :c:type:`unsigned char` C."
592592

593-
#: c-api/arg.rst:594
593+
#: c-api/arg.rst:264 c-api/arg.rst:594
594594
msgid "``h`` (:class:`int`) [short int]"
595595
msgstr "``h`` (:class:`int`) [``short int``]"
596596

597597
#: c-api/arg.rst:264
598598
msgid "Convert a Python integer to a C :c:type:`short int`."
599599
msgstr "Convertit un entier Python en un :c:type:`short int` C."
600600

601-
#: c-api/arg.rst:603
601+
#: c-api/arg.rst:268 c-api/arg.rst:603
602602
msgid "``H`` (:class:`int`) [unsigned short int]"
603603
msgstr "``H`` (:class:`int`) [``unsigned short int``]"
604604

@@ -610,15 +610,15 @@ msgstr ""
610610
"Convertit un entier Python en un :c:type:`unsigned short int` C, sans "
611611
"contrôle de débordement."
612612

613-
#: c-api/arg.rst:588
613+
#: c-api/arg.rst:271 c-api/arg.rst:588
614614
msgid "``i`` (:class:`int`) [int]"
615615
msgstr "``i`` (:class:`int`) [``int``]"
616616

617617
#: c-api/arg.rst:271
618618
msgid "Convert a Python integer to a plain C :c:type:`int`."
619619
msgstr "Convertit un entier Python en un :c:type:`int` C."
620620

621-
#: c-api/arg.rst:606
621+
#: c-api/arg.rst:275 c-api/arg.rst:606
622622
msgid "``I`` (:class:`int`) [unsigned int]"
623623
msgstr "``I`` (:class:`int`) [``unsigned int``]"
624624

@@ -630,15 +630,15 @@ msgstr ""
630630
"Convertit un entier Python en un :c:type:`unsigned int` C, sans contrôle de "
631631
"le débordement."
632632

633-
#: c-api/arg.rst:597
633+
#: c-api/arg.rst:278 c-api/arg.rst:597
634634
msgid "``l`` (:class:`int`) [long int]"
635635
msgstr "``l`` (:class:`int`) [``long int``]"
636636

637637
#: c-api/arg.rst:278
638638
msgid "Convert a Python integer to a C :c:type:`long int`."
639639
msgstr "Convertit un entier Python en un :c:type:`long int`."
640640

641-
#: c-api/arg.rst:609
641+
#: c-api/arg.rst:282 c-api/arg.rst:609
642642
msgid "``k`` (:class:`int`) [unsigned long]"
643643
msgstr "``k`` (:class:`int`) [``unsigned long``]"
644644

@@ -650,7 +650,7 @@ msgstr ""
650650
"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
651651
"le débordement."
652652

653-
#: c-api/arg.rst:612
653+
#: c-api/arg.rst:285 c-api/arg.rst:612
654654
msgid "``L`` (:class:`int`) [long long]"
655655
msgstr "``L`` (:class:`int`) [``long long``]"
656656

@@ -659,7 +659,7 @@ msgstr "``L`` (:class:`int`) [``long long``]"
659659
msgid "Convert a Python integer to a C :c:type:`long long`."
660660
msgstr "Convertit un entier Python en un :c:type:`long int`."
661661

662-
#: c-api/arg.rst:615
662+
#: c-api/arg.rst:289 c-api/arg.rst:615
663663
msgid "``K`` (:class:`int`) [unsigned long long]"
664664
msgstr "``K`` (:class:`int`) [``unsigned long long``]"
665665

@@ -672,7 +672,7 @@ msgstr ""
672672
"Convertit un entier Python en un :c:type:`unsigned long` C sans en vérifier "
673673
"le débordement."
674674

675-
#: c-api/arg.rst:618
675+
#: c-api/arg.rst:292 c-api/arg.rst:618
676676
msgid "``n`` (:class:`int`) [Py_ssize_t]"
677677
msgstr "``n`` (:class:`int`) [``Py_ssize_t``]"
678678

@@ -696,7 +696,7 @@ msgstr ""
696696
msgid "Allow :class:`bytearray` objects."
697697
msgstr ""
698698

699-
#: c-api/arg.rst:626
699+
#: c-api/arg.rst:303 c-api/arg.rst:626
700700
msgid "``C`` (:class:`str` of length 1) [int]"
701701
msgstr "``C`` (:class:`str` de longueur 1) [``int``]"
702702

@@ -708,15 +708,15 @@ msgstr ""
708708
"Convertit un caractère Python, représenté comme un objet :class:`str` de "
709709
"longueur 1, en un :c:type:`int` C."
710710

711-
#: c-api/arg.rst:632
711+
#: c-api/arg.rst:306 c-api/arg.rst:632
712712
msgid "``f`` (:class:`float`) [float]"
713713
msgstr "``f`` (:class:`float`) [``float``]"
714714

715715
#: c-api/arg.rst:306
716716
msgid "Convert a Python floating point number to a C :c:type:`float`."
717717
msgstr "Convertit un nombre flottant Python vers un :c:type:`float`."
718718

719-
#: c-api/arg.rst:629
719+
#: c-api/arg.rst:309 c-api/arg.rst:629
720720
msgid "``d`` (:class:`float`) [double]"
721721
msgstr "``d`` (:class:`float`) [``double``]"
722722

@@ -738,7 +738,7 @@ msgstr ""
738738
msgid "Other objects"
739739
msgstr "Autres objets"
740740

741-
#: c-api/arg.rst:643
741+
#: c-api/arg.rst:320 c-api/arg.rst:643
742742
msgid "``O`` (object) [PyObject \\*]"
743743
msgstr "``O`` (objet) [``PyObject *``]"
744744

@@ -767,7 +767,7 @@ msgid ""
767767
"required type, :exc:`TypeError` is raised."
768768
msgstr ""
769769

770-
#: c-api/arg.rst:657
770+
#: c-api/arg.rst:352 c-api/arg.rst:657
771771
msgid "``O&`` (object) [*converter*, *anything*]"
772772
msgstr "``O&`` (objet) [*converter*, *anything*]"
773773

@@ -815,7 +815,7 @@ msgid ""
815815
"how Python tests values for truth."
816816
msgstr ""
817817

818-
#: c-api/arg.rst:660
818+
#: c-api/arg.rst:366 c-api/arg.rst:660
819819
msgid "``(items)`` (:class:`tuple`) [*matching-items*]"
820820
msgstr "``(items)`` (:class:`tuple`) [*matching-items*]"
821821

@@ -1112,7 +1112,7 @@ msgid ""
11121112
"string pointer is ``NULL``, ``None`` is returned."
11131113
msgstr ""
11141114

1115-
#: c-api/arg.rst:582
1115+
#: c-api/arg.rst:566 c-api/arg.rst:582
11161116
msgid "Same as ``s``."
11171117
msgstr ""
11181118

@@ -1123,7 +1123,7 @@ msgid ""
11231123
"`Py_ssize_t`]"
11241124
msgstr "``z#`` (:class:`str` ou ``None``) [``const char *``, ``int``]"
11251125

1126-
#: c-api/arg.rst:585
1126+
#: c-api/arg.rst:569 c-api/arg.rst:585
11271127
msgid "Same as ``s#``."
11281128
msgstr ""
11291129

c-api/buffer.po

Lines changed: 35 additions & 27 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-07-20 10:51+0200\n"
99
"PO-Revision-Date: 2018-10-04 12:18+0200\n"
1010
"Last-Translator: \n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -431,34 +431,38 @@ msgid ""
431431
"flags below it."
432432
msgstr ""
433433

434-
#: c-api/buffer.rst:296 c-api/buffer.rst:321
434+
#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
435435
msgid "Request"
436436
msgstr ""
437437

438-
#: c-api/buffer.rst:296 c-api/buffer.rst:321
438+
#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
439439
msgid "shape"
440440
msgstr ""
441441

442-
#: c-api/buffer.rst:296 c-api/buffer.rst:321
442+
#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
443443
msgid "strides"
444444
msgstr ""
445445

446-
#: c-api/buffer.rst:296 c-api/buffer.rst:321
446+
#: c-api/buffer.rst:272 c-api/buffer.rst:296 c-api/buffer.rst:321
447447
msgid "suboffsets"
448448
msgstr ""
449449

450-
#: c-api/buffer.rst:276 c-api/buffer.rst:298 c-api/buffer.rst:302
451-
#: c-api/buffer.rst:323 c-api/buffer.rst:327 c-api/buffer.rst:331
452-
#: c-api/buffer.rst:335 c-api/buffer.rst:337
450+
#: c-api/buffer.rst:274 c-api/buffer.rst:276 c-api/buffer.rst:278
451+
#: c-api/buffer.rst:298 c-api/buffer.rst:300 c-api/buffer.rst:302
452+
#: c-api/buffer.rst:304 c-api/buffer.rst:323 c-api/buffer.rst:325
453+
#: c-api/buffer.rst:327 c-api/buffer.rst:329 c-api/buffer.rst:331
454+
#: c-api/buffer.rst:333 c-api/buffer.rst:335 c-api/buffer.rst:337
453455
msgid "yes"
454456
msgstr "oui"
455457

456-
#: c-api/buffer.rst:323 c-api/buffer.rst:325
458+
#: c-api/buffer.rst:274 c-api/buffer.rst:323 c-api/buffer.rst:325
457459
msgid "if needed"
458460
msgstr ""
459461

460-
#: c-api/buffer.rst:278 c-api/buffer.rst:298 c-api/buffer.rst:302
461-
#: c-api/buffer.rst:327 c-api/buffer.rst:331 c-api/buffer.rst:335
462+
#: c-api/buffer.rst:276 c-api/buffer.rst:278 c-api/buffer.rst:280
463+
#: c-api/buffer.rst:298 c-api/buffer.rst:300 c-api/buffer.rst:302
464+
#: c-api/buffer.rst:304 c-api/buffer.rst:327 c-api/buffer.rst:329
465+
#: c-api/buffer.rst:331 c-api/buffer.rst:333 c-api/buffer.rst:335
462466
#: c-api/buffer.rst:337
463467
msgid "NULL"
464468
msgstr ""
@@ -474,11 +478,12 @@ msgid ""
474478
"must be C-contiguous."
475479
msgstr ""
476480

477-
#: c-api/buffer.rst:321
481+
#: c-api/buffer.rst:296 c-api/buffer.rst:321
478482
msgid "contig"
479483
msgstr ""
480484

481-
#: c-api/buffer.rst:304 c-api/buffer.rst:337
485+
#: c-api/buffer.rst:298 c-api/buffer.rst:304 c-api/buffer.rst:335
486+
#: c-api/buffer.rst:337
482487
msgid "C"
483488
msgstr ""
484489

@@ -515,15 +520,18 @@ msgstr ""
515520
msgid "format"
516521
msgstr "format"
517522

518-
#: c-api/buffer.rst:325 c-api/buffer.rst:329 c-api/buffer.rst:333
523+
#: c-api/buffer.rst:323 c-api/buffer.rst:325 c-api/buffer.rst:327
524+
#: c-api/buffer.rst:329 c-api/buffer.rst:331 c-api/buffer.rst:333
519525
msgid "U"
520526
msgstr ""
521527

522-
#: c-api/buffer.rst:327 c-api/buffer.rst:335
528+
#: c-api/buffer.rst:323 c-api/buffer.rst:327 c-api/buffer.rst:331
529+
#: c-api/buffer.rst:335
523530
msgid "0"
524531
msgstr "0"
525532

526-
#: c-api/buffer.rst:329 c-api/buffer.rst:337
533+
#: c-api/buffer.rst:325 c-api/buffer.rst:329 c-api/buffer.rst:333
534+
#: c-api/buffer.rst:337
527535
msgid "1 or 0"
528536
msgstr ""
529537

@@ -638,70 +646,70 @@ msgstr ""
638646
#: c-api/buffer.rst:467
639647
msgid ""
640648
"Return the implied :c:data:`~Py_buffer.itemsize` from :c:data:`~Py_buffer."
641-
"format`. This function is not yet implemented."
649+
"format`. On error, raise an exception and return -1."
642650
msgstr ""
643651

644-
#: c-api/buffer.rst:473
652+
#: c-api/buffer.rst:475
645653
msgid ""
646654
"Return ``1`` if the memory defined by the *view* is C-style (*order* is "
647655
"``'C'``) or Fortran-style (*order* is ``'F'``) :term:`contiguous` or either "
648656
"one (*order* is ``'A'``). Return ``0`` otherwise. This function always "
649657
"succeeds."
650658
msgstr ""
651659

652-
#: c-api/buffer.rst:480
660+
#: c-api/buffer.rst:482
653661
msgid ""
654662
"Get the memory area pointed to by the *indices* inside the given *view*. "
655663
"*indices* must point to an array of ``view->ndim`` indices."
656664
msgstr ""
657665

658-
#: c-api/buffer.rst:486
666+
#: c-api/buffer.rst:488
659667
msgid ""
660668
"Copy contiguous *len* bytes from *buf* to *view*. *fort* can be ``'C'`` or "
661669
"``'F'`` (for C-style or Fortran-style ordering). ``0`` is returned on "
662670
"success, ``-1`` on error."
663671
msgstr ""
664672

665-
#: c-api/buffer.rst:493
673+
#: c-api/buffer.rst:495
666674
msgid ""
667675
"Copy *len* bytes from *src* to its contiguous representation in *buf*. "
668676
"*order* can be ``'C'`` or ``'F'`` or ``'A'`` (for C-style or Fortran-style "
669677
"ordering or either one). ``0`` is returned on success, ``-1`` on error."
670678
msgstr ""
671679

672-
#: c-api/buffer.rst:497
680+
#: c-api/buffer.rst:499
673681
msgid "This function fails if *len* != *src->len*."
674682
msgstr ""
675683

676-
#: c-api/buffer.rst:502
684+
#: c-api/buffer.rst:504
677685
msgid ""
678686
"Fill the *strides* array with byte-strides of a :term:`contiguous` (C-style "
679687
"if *order* is ``'C'`` or Fortran-style if *order* is ``'F'``) array of the "
680688
"given shape with the given number of bytes per element."
681689
msgstr ""
682690

683-
#: c-api/buffer.rst:509
691+
#: c-api/buffer.rst:511
684692
msgid ""
685693
"Handle buffer requests for an exporter that wants to expose *buf* of size "
686694
"*len* with writability set according to *readonly*. *buf* is interpreted as "
687695
"a sequence of unsigned bytes."
688696
msgstr ""
689697

690-
#: c-api/buffer.rst:513
698+
#: c-api/buffer.rst:515
691699
msgid ""
692700
"The *flags* argument indicates the request type. This function always fills "
693701
"in *view* as specified by flags, unless *buf* has been designated as read-"
694702
"only and :c:macro:`PyBUF_WRITABLE` is set in *flags*."
695703
msgstr ""
696704

697-
#: c-api/buffer.rst:517
705+
#: c-api/buffer.rst:519
698706
msgid ""
699707
"On success, set :c:member:`view->obj` to a new reference to *exporter* and "
700708
"return 0. Otherwise, raise :c:data:`PyExc_BufferError`, set :c:member:`view-"
701709
">obj` to ``NULL`` and return ``-1``;"
702710
msgstr ""
703711

704-
#: c-api/buffer.rst:521
712+
#: c-api/buffer.rst:523
705713
msgid ""
706714
"If this function is used as part of a :ref:`getbufferproc <buffer-structs>`, "
707715
"*exporter* MUST be set to the exporting object and *flags* must be passed "

0 commit comments

Comments
 (0)