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

Skip to content

Commit 4955f79

Browse files
JulienPalardJulienPalard
authored
Make merge (#1766)
* Make merge * Avoid a newline at each run of merge.py.
1 parent ff88ce4 commit 4955f79

20 files changed

+2652
-2429
lines changed

‎Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +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 := 00ddc1fbd7296ffe066077194a895b175cca26de
24-
25-
23+
CPYTHON_CURRENT_COMMIT := 75ed2ce9e86a7f213fa54e6f8cbbb3ab6f25b5a2
2624
LANGUAGE := fr
2725
BRANCH := 3.10
2826

‎c-api/bool.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2021-01-27 19:26+0100\n"
8+
"POT-Creation-Date: 2021-11-04 18:14+0100\n"
99
"PO-Revision-Date: 2021-10-27 19:19+0200\n"
10+
"Last-Translator: \n"
1011
"Language-Team: FRENCH <[email protected]>\n"
1112
"Language: fr\n"
1213
"MIME-Version: 1.0\n"
1314
"Content-Type: text/plain; charset=UTF-8\n"
1415
"Content-Transfer-Encoding: 8bit\n"
15-
"Last-Translator: \n"
1616
"X-Generator: Poedit 3.0\n"
1717

1818
#: c-api/bool.rst:6

‎c-api/gcsupport.po

Lines changed: 30 additions & 30 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: 2021-09-23 16:16+0200\n"
8+
"POT-Creation-Date: 2021-11-04 18:14+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"
@@ -60,14 +60,31 @@ msgid ""
6060
"initialized, it must call :c:func:`PyObject_GC_Track`."
6161
msgstr ""
6262

63-
#: c-api/gcsupport.rst:37
63+
#: c-api/gcsupport.rst:36
64+
msgid ""
65+
"Similarly, the deallocator for the object must conform to a similar pair of "
66+
"rules:"
67+
msgstr ""
68+
69+
#: c-api/gcsupport.rst:39
70+
msgid ""
71+
"Before fields which refer to other containers are invalidated, :c:func:"
72+
"`PyObject_GC_UnTrack` must be called."
73+
msgstr ""
74+
75+
#: c-api/gcsupport.rst:42
76+
msgid ""
77+
"The object's memory must be deallocated using :c:func:`PyObject_GC_Del`."
78+
msgstr ""
79+
80+
#: c-api/gcsupport.rst:45
6481
msgid ""
6582
"If a type adds the Py_TPFLAGS_HAVE_GC, then it *must* implement at least a :"
6683
"c:member:`~PyTypeObject.tp_traverse` handler or explicitly use one from its "
6784
"subclass or subclasses."
6885
msgstr ""
6986

70-
#: c-api/gcsupport.rst:41
87+
#: c-api/gcsupport.rst:49
7188
msgid ""
7289
"When calling :c:func:`PyType_Ready` or some of the APIs that indirectly call "
7390
"it like :c:func:`PyType_FromSpecWithBases` or :c:func:`PyType_FromSpec` the "
@@ -78,26 +95,26 @@ msgid ""
7895
"include the :const:`Py_TPFLAGS_HAVE_GC` flag."
7996
msgstr ""
8097

81-
#: c-api/gcsupport.rst:51
98+
#: c-api/gcsupport.rst:59
8299
msgid ""
83100
"Analogous to :c:func:`PyObject_New` but for container objects with the :"
84101
"const:`Py_TPFLAGS_HAVE_GC` flag set."
85102
msgstr ""
86103

87-
#: c-api/gcsupport.rst:57
104+
#: c-api/gcsupport.rst:65
88105
msgid ""
89106
"Analogous to :c:func:`PyObject_NewVar` but for container objects with the :"
90107
"const:`Py_TPFLAGS_HAVE_GC` flag set."
91108
msgstr ""
92109

93-
#: c-api/gcsupport.rst:63
110+
#: c-api/gcsupport.rst:71
94111
msgid ""
95112
"Resize an object allocated by :c:func:`PyObject_NewVar`. Returns the "
96113
"resized object or ``NULL`` on failure. *op* must not be tracked by the "
97114
"collector yet."
98115
msgstr ""
99116

100-
#: c-api/gcsupport.rst:69
117+
#: c-api/gcsupport.rst:77
101118
msgid ""
102119
"Adds the object *op* to the set of container objects tracked by the "
103120
"collector. The collector can run at unexpected times so objects must be "
@@ -106,55 +123,38 @@ msgid ""
106123
"usually near the end of the constructor."
107124
msgstr ""
108125

109-
#: c-api/gcsupport.rst:78
126+
#: c-api/gcsupport.rst:86
110127
msgid ""
111128
"Returns non-zero if the object implements the garbage collector protocol, "
112129
"otherwise returns 0."
113130
msgstr ""
114131

115-
#: c-api/gcsupport.rst:81
132+
#: c-api/gcsupport.rst:89
116133
msgid ""
117134
"The object cannot be tracked by the garbage collector if this function "
118135
"returns 0."
119136
msgstr ""
120137

121-
#: c-api/gcsupport.rst:86
138+
#: c-api/gcsupport.rst:94
122139
msgid ""
123140
"Returns 1 if the object type of *op* implements the GC protocol and *op* is "
124141
"being currently tracked by the garbage collector and 0 otherwise."
125142
msgstr ""
126143

127-
#: c-api/gcsupport.rst:89
144+
#: c-api/gcsupport.rst:97
128145
msgid "This is analogous to the Python function :func:`gc.is_tracked`."
129146
msgstr ""
130147

131-
#: c-api/gcsupport.rst:96
148+
#: c-api/gcsupport.rst:104
132149
msgid ""
133150
"Returns 1 if the object type of *op* implements the GC protocol and *op* has "
134151
"been already finalized by the garbage collector and 0 otherwise."
135152
msgstr ""
136153

137-
#: c-api/gcsupport.rst:99
154+
#: c-api/gcsupport.rst:107
138155
msgid "This is analogous to the Python function :func:`gc.is_finalized`."
139156
msgstr ""
140157

141-
#: c-api/gcsupport.rst:103
142-
msgid ""
143-
"Similarly, the deallocator for the object must conform to a similar pair of "
144-
"rules:"
145-
msgstr ""
146-
147-
#: c-api/gcsupport.rst:106
148-
msgid ""
149-
"Before fields which refer to other containers are invalidated, :c:func:"
150-
"`PyObject_GC_UnTrack` must be called."
151-
msgstr ""
152-
153-
#: c-api/gcsupport.rst:109
154-
msgid ""
155-
"The object's memory must be deallocated using :c:func:`PyObject_GC_Del`."
156-
msgstr ""
157-
158158
#: c-api/gcsupport.rst:114
159159
msgid ""
160160
"Releases memory allocated to an object using :c:func:`PyObject_GC_New` or :c:"

0 commit comments

Comments
 (0)