X Tutup
Skip to content

Commit f501352

Browse files
committed
Merge from upstream/3.7
1 parent 517157a commit f501352

File tree

4 files changed

+255
-241
lines changed

4 files changed

+255
-241
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ install:
1111
script:
1212
- powrap --check --quiet **/*.po
1313
- pospell -p dict -l fr_FR **/*.po
14-
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=cad4ff65eb12649cd650059b15d8e12f2ae951ef
14+
- make CPYTHON_CLONE=/tmp/cpython/ COMMIT=3621bf20e94ac3647a8f31a68bf7414dd4b50398

c-api/long.po

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ msgid ""
55
msgstr ""
66
"Project-Id-Version: Python 3.6\n"
77
"Report-Msgid-Bugs-To: \n"
8-
"POT-Creation-Date: 2018-03-23 09:03+0100\n"
8+
"POT-Creation-Date: 2019-06-10 10:50+0200\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"
@@ -158,8 +158,7 @@ msgstr ""
158158

159159
#: ../Doc/c-api/long.rst:140 ../Doc/c-api/long.rst:154
160160
#: ../Doc/c-api/long.rst:169 ../Doc/c-api/long.rst:183
161-
#: ../Doc/c-api/long.rst:200 ../Doc/c-api/long.rst:262
162-
#: ../Doc/c-api/long.rst:274
161+
#: ../Doc/c-api/long.rst:200
163162
msgid "Returns ``-1`` on error. Use :c:func:`PyErr_Occurred` to disambiguate."
164163
msgstr ""
165164

@@ -270,44 +269,56 @@ msgid ""
270269
"the reduction of that value modulo ``ULONG_MAX + 1``."
271270
msgstr ""
272271

273-
#: ../Doc/c-api/long.rst:267
272+
#: ../Doc/c-api/long.rst:262
273+
msgid ""
274+
"Returns ``(unsigned long)-1`` on error. Use :c:func:`PyErr_Occurred` to "
275+
"disambiguate."
276+
msgstr ""
277+
278+
#: ../Doc/c-api/long.rst:268
274279
msgid ""
275280
"Return a C :c:type:`unsigned long long` representation of *obj*. If *obj* "
276281
"is not an instance of :c:type:`PyLongObject`, first call its :meth:`__int__` "
277282
"method (if present) to convert it to a :c:type:`PyLongObject`."
278283
msgstr ""
279284

280-
#: ../Doc/c-api/long.rst:271
285+
#: ../Doc/c-api/long.rst:272
281286
msgid ""
282287
"If the value of *obj* is out of range for an :c:type:`unsigned long long`, "
283288
"return the reduction of that value modulo ``PY_ULLONG_MAX + 1``."
284289
msgstr ""
285290

286-
#: ../Doc/c-api/long.rst:279
291+
#: ../Doc/c-api/long.rst:275
292+
msgid ""
293+
"Returns ``(unsigned long long)-1`` on error. Use :c:func:`PyErr_Occurred` "
294+
"to disambiguate."
295+
msgstr ""
296+
297+
#: ../Doc/c-api/long.rst:281
287298
msgid ""
288299
"Return a C :c:type:`double` representation of *pylong*. *pylong* must be an "
289300
"instance of :c:type:`PyLongObject`."
290301
msgstr ""
291302

292-
#: ../Doc/c-api/long.rst:282
303+
#: ../Doc/c-api/long.rst:284
293304
msgid ""
294305
"Raise :exc:`OverflowError` if the value of *pylong* is out of range for a :c:"
295306
"type:`double`."
296307
msgstr ""
297308

298-
#: ../Doc/c-api/long.rst:285
309+
#: ../Doc/c-api/long.rst:287
299310
msgid ""
300311
"Returns ``-1.0`` on error. Use :c:func:`PyErr_Occurred` to disambiguate."
301312
msgstr ""
302313

303-
#: ../Doc/c-api/long.rst:290
314+
#: ../Doc/c-api/long.rst:292
304315
msgid ""
305316
"Convert a Python integer *pylong* to a C :c:type:`void` pointer. If *pylong* "
306317
"cannot be converted, an :exc:`OverflowError` will be raised. This is only "
307318
"assured to produce a usable :c:type:`void` pointer for values created with :"
308319
"c:func:`PyLong_FromVoidPtr`."
309320
msgstr ""
310321

311-
#: ../Doc/c-api/long.rst:295
322+
#: ../Doc/c-api/long.rst:297
312323
msgid "Returns *NULL* on error. Use :c:func:`PyErr_Occurred` to disambiguate."
313324
msgstr ""

0 commit comments

Comments
 (0)
X Tutup