Skip to content

Commit b60c43c

Browse files
committed
Make merge: removing example code.
It won't pass grammar checker, orthograph checker, po syntax checker, and rst syntax checker anyway...
1 parent b8a0fd6 commit b60c43c

File tree

350 files changed

+5555
-73536
lines changed

Some content is hidden

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

350 files changed

+5555
-73536
lines changed

.scripts/merge.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,14 @@ def main():
123123
args = parse_args()
124124
setup_repo(args.cpython_repo, args.branch)
125125
run(
126-
*["sphinx-build", "-jauto", "-QDgettext_compact=0", "-bgettext", ".", "../pot"],
126+
"sphinx-build",
127+
"-jauto",
128+
"--silent",
129+
"-Dgettext_compact=0",
130+
"-Dgettext_additional_targets=['index']",
131+
"-bgettext",
132+
".",
133+
"../pot",
127134
cwd=args.cpython_repo / "Doc",
128135
)
129136
pot_path = args.cpython_repo / "pot"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# from which we generated our po files. We use it here so when we
2121
# test build, we're building with the .rst files that generated our
2222
# .po files.
23-
CPYTHON_CURRENT_COMMIT := 8dc0575047559857cb923545a1c69d8ddc639a41
23+
CPYTHON_CURRENT_COMMIT := 256fc5529af23f16f0dca2d0e24a936e1c4d67d3
2424
LANGUAGE := fr
2525
BRANCH := 3.13
2626

c-api/arg.po

Lines changed: 1 addition & 39 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: 2024-10-29 22:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+0100\n"
99
"PO-Revision-Date: 2021-12-11 11:44+0100\n"
1010
"Last-Translator: Julien Palard <julien@palard.fr>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -748,10 +748,6 @@ msgid ""
748748
"*converter* function in turn is called as follows::"
749749
msgstr ""
750750

751-
#: c-api/arg.rst:316
752-
msgid "status = converter(object, address);"
753-
msgstr ""
754-
755751
#: c-api/arg.rst:318
756752
msgid ""
757753
"where *object* is the Python object to be converted and *address* is the :c:"
@@ -979,20 +975,6 @@ msgstr ""
979975
msgid "Example::"
980976
msgstr "Exemple ::"
981977

982-
#: c-api/arg.rst:467
983-
msgid ""
984-
"// Function using METH_O calling convention\n"
985-
"static PyObject*\n"
986-
"my_function(PyObject *module, PyObject *arg)\n"
987-
"{\n"
988-
" int value;\n"
989-
" if (!PyArg_Parse(arg, \"i:my_function\", &value)) {\n"
990-
" return NULL;\n"
991-
" }\n"
992-
" // ... use value ...\n"
993-
"}"
994-
msgstr ""
995-
996978
#: c-api/arg.rst:481
997979
msgid ""
998980
"A simpler form of parameter retrieval which does not use a format string to "
@@ -1017,32 +999,12 @@ msgid ""
1017999
"the :mod:`!_weakref` helper module for weak references::"
10181000
msgstr ""
10191001

1020-
#: c-api/arg.rst:499
1021-
msgid ""
1022-
"static PyObject *\n"
1023-
"weakref_ref(PyObject *self, PyObject *args)\n"
1024-
"{\n"
1025-
" PyObject *object;\n"
1026-
" PyObject *callback = NULL;\n"
1027-
" PyObject *result = NULL;\n"
1028-
"\n"
1029-
" if (PyArg_UnpackTuple(args, \"ref\", 1, 2, &object, &callback)) {\n"
1030-
" result = PyWeakref_NewRef(object, callback);\n"
1031-
" }\n"
1032-
" return result;\n"
1033-
"}"
1034-
msgstr ""
1035-
10361002
#: c-api/arg.rst:512
10371003
msgid ""
10381004
"The call to :c:func:`PyArg_UnpackTuple` in this example is entirely "
10391005
"equivalent to this call to :c:func:`PyArg_ParseTuple`::"
10401006
msgstr ""
10411007

1042-
#: c-api/arg.rst:515
1043-
msgid "PyArg_ParseTuple(args, \"O|O:ref\", &object, &callback)"
1044-
msgstr ""
1045-
10461008
#: c-api/arg.rst:519
10471009
msgid ""
10481010
"The value to be inserted, if any, before :c:expr:`char * const *` in the "

c-api/buffer.po

Lines changed: 11 additions & 80 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: 2024-10-29 22:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+0100\n"
99
"PO-Revision-Date: 2021-10-27 21:13+0200\n"
1010
"Last-Translator: David GIRAUD <davidgiraud@protonmail.com>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -569,49 +569,13 @@ msgid ""
569569
"dimensional array as follows:"
570570
msgstr ""
571571

572-
#: c-api/buffer.rst:369
573-
msgid ""
574-
"ptr = (char *)buf + indices[0] * strides[0] + ... + indices[n-1] * "
575-
"strides[n-1];\n"
576-
"item = *((typeof(item) *)ptr);"
577-
msgstr ""
578-
579572
#: c-api/buffer.rst:375
580573
msgid ""
581574
"As noted above, :c:member:`~Py_buffer.buf` can point to any location within "
582575
"the actual memory block. An exporter can check the validity of a buffer with "
583576
"this function:"
584577
msgstr ""
585578

586-
#: c-api/buffer.rst:379
587-
msgid ""
588-
"def verify_structure(memlen, itemsize, ndim, shape, strides, offset):\n"
589-
" \"\"\"Verify that the parameters represent a valid array within\n"
590-
" the bounds of the allocated memory:\n"
591-
" char *mem: start of the physical memory block\n"
592-
" memlen: length of the physical memory block\n"
593-
" offset: (char *)buf - mem\n"
594-
" \"\"\"\n"
595-
" if offset % itemsize:\n"
596-
" return False\n"
597-
" if offset < 0 or offset+itemsize > memlen:\n"
598-
" return False\n"
599-
" if any(v % itemsize for v in strides):\n"
600-
" return False\n"
601-
"\n"
602-
" if ndim <= 0:\n"
603-
" return ndim == 0 and not shape and not strides\n"
604-
" if 0 in shape:\n"
605-
" return True\n"
606-
"\n"
607-
" imin = sum(strides[j]*(shape[j]-1) for j in range(ndim)\n"
608-
" if strides[j] <= 0)\n"
609-
" imax = sum(strides[j]*(shape[j]-1) for j in range(ndim)\n"
610-
" if strides[j] > 0)\n"
611-
"\n"
612-
" return 0 <= offset+imin and offset+imax+itemsize <= memlen"
613-
msgstr ""
614-
615579
#: c-api/buffer.rst:409
616580
msgid "PIL-style: shape, strides and suboffsets"
617581
msgstr ""
@@ -634,22 +598,6 @@ msgid ""
634598
"strides and suboffsets::"
635599
msgstr ""
636600

637-
#: c-api/buffer.rst:424
638-
msgid ""
639-
"void *get_item_pointer(int ndim, void *buf, Py_ssize_t *strides,\n"
640-
" Py_ssize_t *suboffsets, Py_ssize_t *indices) {\n"
641-
" char *pointer = (char*)buf;\n"
642-
" int i;\n"
643-
" for (i = 0; i < ndim; i++) {\n"
644-
" pointer += strides[i] * indices[i];\n"
645-
" if (suboffsets[i] >=0 ) {\n"
646-
" pointer = *((char**)pointer) + suboffsets[i];\n"
647-
" }\n"
648-
" }\n"
649-
" return (void*)pointer;\n"
650-
"}"
651-
msgstr ""
652-
653601
#: c-api/buffer.rst:439
654602
msgid "Buffer-related functions"
655603
msgstr "Fonctions relatives aux tampons"
@@ -784,38 +732,21 @@ msgid ""
784732
"unmodified. Otherwise, *exporter* MUST be ``NULL``."
785733
msgstr ""
786734

787-
#: c-api/buffer.rst:3
788735
#, fuzzy
789-
msgid "buffer protocol"
790-
msgstr "Protocole tampon"
736+
#~ msgid "buffer protocol"
737+
#~ msgstr "Protocole tampon"
791738

792-
#: c-api/buffer.rst:3
793739
#, fuzzy
794-
msgid "buffer interface"
795-
msgstr "La structure *buffer*"
740+
#~ msgid "buffer interface"
741+
#~ msgstr "La structure *buffer*"
796742

797-
#: c-api/buffer.rst:3
798743
#, fuzzy
799-
msgid "(see buffer protocol)"
800-
msgstr "Protocole tampon"
744+
#~ msgid "(see buffer protocol)"
745+
#~ msgstr "Protocole tampon"
801746

802-
#: c-api/buffer.rst:3
803-
msgid "buffer object"
804-
msgstr ""
805-
806-
#: c-api/buffer.rst:32
807747
#, fuzzy
808-
msgid "PyBufferProcs (C type)"
809-
msgstr "Protocole tampon"
748+
#~ msgid "PyBufferProcs (C type)"
749+
#~ msgstr "Protocole tampon"
810750

811-
#: c-api/buffer.rst:295
812-
msgid "contiguous"
813-
msgstr "contigu"
814-
815-
#: c-api/buffer.rst:295
816-
msgid "C-contiguous"
817-
msgstr ""
818-
819-
#: c-api/buffer.rst:295
820-
msgid "Fortran contiguous"
821-
msgstr ""
751+
#~ msgid "contiguous"
752+
#~ msgstr "contigu"

c-api/bytearray.po

Lines changed: 3 additions & 8 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: 2024-10-29 21:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+0100\n"
99
"PO-Revision-Date: 2021-05-05 14:32+0200\n"
1010
"Last-Translator: Mindiell <mindiell@mindiell.net>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -121,13 +121,8 @@ msgstr "Version macro de :c:func:`PyByteArray_AsString`."
121121
msgid "Similar to :c:func:`PyByteArray_Size`, but without error checking."
122122
msgstr ""
123123

124-
#: c-api/bytearray.rst:8
125-
msgid "object"
126-
msgstr "objet"
127-
128-
#: c-api/bytearray.rst:8
129-
msgid "bytearray"
130-
msgstr ""
124+
#~ msgid "object"
125+
#~ msgstr "objet"
131126

132127
#~ msgid "Macro version of :c:func:`PyByteArray_Size`."
133128
#~ msgstr "Version macro de :c:func:`PyByteArray_Size`."

c-api/bytes.po

Lines changed: 5 additions & 7 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: 2024-10-29 22:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+0100\n"
99
"PO-Revision-Date: 2018-07-03 11:50+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -333,13 +333,11 @@ msgid ""
333333
"``NULL``, :exc:`MemoryError` is set, and ``-1`` is returned."
334334
msgstr ""
335335

336-
#: c-api/bytes.rst:11
337-
msgid "object"
338-
msgstr "objet"
336+
#~ msgid "object"
337+
#~ msgstr "objet"
339338

340-
#: c-api/bytes.rst:11
341-
msgid "bytes"
342-
msgstr "*bytes* (séquence d'octets)"
339+
#~ msgid "bytes"
340+
#~ msgstr "*bytes* (séquence d'octets)"
343341

344342
#~ msgid ":attr:`%%`"
345343
#~ msgstr ":attr:`%%`"

c-api/call.po

Lines changed: 1 addition & 10 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: 2024-10-29 22:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+0100\n"
99
"PO-Revision-Date: 2020-07-20 15:07+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -33,11 +33,6 @@ msgid ""
3333
"callable. The signature of the slot is::"
3434
msgstr ""
3535

36-
#: c-api/call.rst:17
37-
msgid ""
38-
"PyObject *tp_call(PyObject *callable, PyObject *args, PyObject *kwargs);"
39-
msgstr ""
40-
4136
#: c-api/call.rst:19
4237
msgid ""
4338
"A call is made using a tuple for the positional arguments and a dict for the "
@@ -206,10 +201,6 @@ msgid ""
206201
"Currently equivalent to::"
207202
msgstr ""
208203

209-
#: c-api/call.rst:140
210-
msgid "(Py_ssize_t)(nargsf & ~PY_VECTORCALL_ARGUMENTS_OFFSET)"
211-
msgstr ""
212-
213204
#: c-api/call.rst:142
214205
msgid ""
215206
"However, the function ``PyVectorcall_NARGS`` should be used to allow for "

c-api/capsule.po

Lines changed: 5 additions & 11 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: 2024-10-29 21:40+0100\n"
8+
"POT-Creation-Date: 2024-11-01 00:16+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 <traductions@lists.afpy.org>\n"
@@ -39,10 +39,6 @@ msgstr ""
3939
msgid "The type of a destructor callback for a capsule. Defined as::"
4040
msgstr ""
4141

42-
#: c-api/capsule.rst:29
43-
msgid "typedef void (*PyCapsule_Destructor)(PyObject *);"
44-
msgstr ""
45-
4642
#: c-api/capsule.rst:31
4743
msgid ""
4844
"See :c:func:`PyCapsule_New` for the semantics of PyCapsule_Destructor "
@@ -204,11 +200,9 @@ msgid ""
204200
"``NULL``."
205201
msgstr ""
206202

207-
#: c-api/capsule.rst:8
208-
msgid "object"
209-
msgstr "objet"
203+
#~ msgid "object"
204+
#~ msgstr "objet"
210205

211-
#: c-api/capsule.rst:8
212206
#, fuzzy
213-
msgid "Capsule"
214-
msgstr "Capsules"
207+
#~ msgid "Capsule"
208+
#~ msgstr "Capsules"

0 commit comments

Comments
 (0)