Skip to content

Commit 0da9766

Browse files
JulienPalardJulienPalard
committed
Merge branch 'merge-pot' into 3.7
2 parents 7f06f17 + a3ff2cb commit 0da9766

Some content is hidden

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

71 files changed

+8153
-5220
lines changed

‎README.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ simple quote guillemet simple, apostrophe (apostrophe
239239
is to glue, guillemet is to surround)
240240
socket *socket*
241241
statement instruction
242+
subprocess sous-processus
242243
thread fil d'exécution
243244
underscore tiret bas, *underscore*
244245
expression expression

‎c-api/contextvars.po

Lines changed: 41 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.7\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-06-28 15:29+0200\n"
8+
"POT-Creation-Date: 2018-10-12 18:59+0200\n"
99
"PO-Revision-Date: 2018-08-03 23:47+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
@@ -18,148 +18,159 @@ msgstr ""
1818
msgid "Context Variables Objects"
1919
msgstr ""
2020

21-
#: ../Doc/c-api/contextvars.rst:10
21+
#: ../Doc/c-api/contextvars.rst:13
22+
msgid ""
23+
"In Python 3.7.1 the signatures of all context variables C APIs were "
24+
"**changed** to use :c:type:`PyObject` pointers instead of :c:type:"
25+
"`PyContext`, :c:type:`PyContextVar`, and :c:type:`PyContextToken`, e.g.::"
26+
msgstr ""
27+
28+
#: ../Doc/c-api/contextvars.rst:24
29+
msgid "See :issue:`34762` for more details."
30+
msgstr ""
31+
32+
#: ../Doc/c-api/contextvars.rst:29
2233
msgid ""
2334
"This section details the public C API for the :mod:`contextvars` module."
2435
msgstr ""
2536

26-
#: ../Doc/c-api/contextvars.rst:14
37+
#: ../Doc/c-api/contextvars.rst:33
2738
msgid ""
2839
"The C structure used to represent a :class:`contextvars.Context` object."
2940
msgstr ""
3041

31-
#: ../Doc/c-api/contextvars.rst:19
42+
#: ../Doc/c-api/contextvars.rst:38
3243
msgid ""
3344
"The C structure used to represent a :class:`contextvars.ContextVar` object."
3445
msgstr ""
3546

36-
#: ../Doc/c-api/contextvars.rst:24
47+
#: ../Doc/c-api/contextvars.rst:43
3748
msgid "The C structure used to represent a :class:`contextvars.Token` object."
3849
msgstr ""
3950

40-
#: ../Doc/c-api/contextvars.rst:28
51+
#: ../Doc/c-api/contextvars.rst:47
4152
msgid "The type object representing the *context* type."
4253
msgstr ""
4354

44-
#: ../Doc/c-api/contextvars.rst:32
55+
#: ../Doc/c-api/contextvars.rst:51
4556
msgid "The type object representing the *context variable* type."
4657
msgstr ""
4758

48-
#: ../Doc/c-api/contextvars.rst:36
59+
#: ../Doc/c-api/contextvars.rst:55
4960
msgid "The type object representing the *context variable token* type."
5061
msgstr ""
5162

52-
#: ../Doc/c-api/contextvars.rst:39
63+
#: ../Doc/c-api/contextvars.rst:58
5364
msgid "Type-check macros:"
5465
msgstr ""
5566

56-
#: ../Doc/c-api/contextvars.rst:43
67+
#: ../Doc/c-api/contextvars.rst:62
5768
msgid ""
5869
"Return true if *o* is of type :c:data:`PyContext_Type`. *o* must not be "
5970
"*NULL*. This function always succeeds."
6071
msgstr ""
6172

62-
#: ../Doc/c-api/contextvars.rst:48
73+
#: ../Doc/c-api/contextvars.rst:67
6374
msgid ""
6475
"Return true if *o* is of type :c:data:`PyContextVar_Type`. *o* must not be "
6576
"*NULL*. This function always succeeds."
6677
msgstr ""
6778

68-
#: ../Doc/c-api/contextvars.rst:53
79+
#: ../Doc/c-api/contextvars.rst:72
6980
msgid ""
7081
"Return true if *o* is of type :c:data:`PyContextToken_Type`. *o* must not be "
7182
"*NULL*. This function always succeeds."
7283
msgstr ""
7384

74-
#: ../Doc/c-api/contextvars.rst:57
85+
#: ../Doc/c-api/contextvars.rst:76
7586
msgid "Context object management functions:"
7687
msgstr ""
7788

78-
#: ../Doc/c-api/contextvars.rst:61
89+
#: ../Doc/c-api/contextvars.rst:80
7990
msgid ""
8091
"Create a new empty context object. Returns ``NULL`` if an error has "
8192
"occurred."
8293
msgstr ""
8394

84-
#: ../Doc/c-api/contextvars.rst:66
95+
#: ../Doc/c-api/contextvars.rst:85
8596
msgid ""
8697
"Create a shallow copy of the passed *ctx* context object. Returns ``NULL`` "
8798
"if an error has occurred."
8899
msgstr ""
89100

90-
#: ../Doc/c-api/contextvars.rst:71
101+
#: ../Doc/c-api/contextvars.rst:90
91102
msgid ""
92103
"Create a shallow copy of the current thread context. Returns ``NULL`` if an "
93104
"error has occurred."
94105
msgstr ""
95106

96-
#: ../Doc/c-api/contextvars.rst:76
107+
#: ../Doc/c-api/contextvars.rst:95
97108
msgid ""
98109
"Set *ctx* as the current context for the current thread. Returns ``0`` on "
99110
"success, and ``-1`` on error."
100111
msgstr ""
101112

102-
#: ../Doc/c-api/contextvars.rst:81
113+
#: ../Doc/c-api/contextvars.rst:100
103114
msgid ""
104115
"Deactivate the *ctx* context and restore the previous context as the current "
105116
"context for the current thread. Returns ``0`` on success, and ``-1`` on "
106117
"error."
107118
msgstr ""
108119

109-
#: ../Doc/c-api/contextvars.rst:87
120+
#: ../Doc/c-api/contextvars.rst:106
110121
msgid ""
111122
"Clear the context variable free list. Return the total number of freed "
112123
"items. This function always succeeds."
113124
msgstr ""
114125

115-
#: ../Doc/c-api/contextvars.rst:91
126+
#: ../Doc/c-api/contextvars.rst:110
116127
msgid "Context variable functions:"
117128
msgstr ""
118129

119-
#: ../Doc/c-api/contextvars.rst:95
130+
#: ../Doc/c-api/contextvars.rst:114
120131
msgid ""
121132
"Create a new ``ContextVar`` object. The *name* parameter is used for "
122133
"introspection and debug purposes. The *def* parameter may optionally "
123134
"specify the default value for the context variable. If an error has "
124135
"occurred, this function returns ``NULL``."
125136
msgstr ""
126137

127-
#: ../Doc/c-api/contextvars.rst:102
138+
#: ../Doc/c-api/contextvars.rst:121
128139
msgid ""
129140
"Get the value of a context variable. Returns ``-1`` if an error has "
130141
"occurred during lookup, and ``0`` if no error occurred, whether or not a "
131142
"value was found."
132143
msgstr ""
133144

134-
#: ../Doc/c-api/contextvars.rst:106
145+
#: ../Doc/c-api/contextvars.rst:125
135146
msgid ""
136147
"If the context variable was found, *value* will be a pointer to it. If the "
137148
"context variable was *not* found, *value* will point to:"
138149
msgstr ""
139150

140-
#: ../Doc/c-api/contextvars.rst:109
151+
#: ../Doc/c-api/contextvars.rst:128
141152
msgid "*default_value*, if not ``NULL``;"
142153
msgstr ""
143154

144-
#: ../Doc/c-api/contextvars.rst:110
155+
#: ../Doc/c-api/contextvars.rst:129
145156
msgid "the default value of *var*, if not ``NULL``;"
146157
msgstr ""
147158

148-
#: ../Doc/c-api/contextvars.rst:111
159+
#: ../Doc/c-api/contextvars.rst:130
149160
msgid "``NULL``"
150161
msgstr "``NULL``"
151162

152-
#: ../Doc/c-api/contextvars.rst:113
163+
#: ../Doc/c-api/contextvars.rst:132
153164
msgid "If the value was found, the function will create a new reference to it."
154165
msgstr ""
155166

156-
#: ../Doc/c-api/contextvars.rst:117
167+
#: ../Doc/c-api/contextvars.rst:136
157168
msgid ""
158169
"Set the value of *var* to *value* in the current context. Returns a pointer "
159-
"to a :c:type:`PyContextToken` object, or ``NULL`` if an error has occurred."
170+
"to a :c:type:`PyObject` object, or ``NULL`` if an error has occurred."
160171
msgstr ""
161172

162-
#: ../Doc/c-api/contextvars.rst:123
173+
#: ../Doc/c-api/contextvars.rst:142
163174
msgid ""
164175
"Reset the state of the *var* context variable to that it was in before :c:"
165176
"func:`PyContextVar_Set` that returned the *token* was called. This function "

0 commit comments

Comments
 (0)