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

Skip to content

Commit 7b88307

Browse files
JulienPalardJulienPalard
authored
Make merge (#1555)
Automerge of PR #1555 by @JulienPalard
1 parent a6f49d9 commit 7b88307

Some content is hidden

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

53 files changed

+2942
-863
lines changed

‎Makefile

+3-4
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 := 895591c1f0bdec5ad357fe6a5fd0875990061357
24+
CPYTHON_CURRENT_COMMIT := eec8e61992fb654d4cf58de4d727c18622b8303e
2525

2626
CPYTHON_PATH := ../cpython/
2727

@@ -160,11 +160,10 @@ merge: ensure_prerequisites
160160
fi \
161161
done
162162
rm -fr $(CPYTHON_PATH)/pot/
163-
@echo "Replacing CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C $(CPYTHON_PATH) rev-parse HEAD)
164-
sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(CPYTHON_PATH) rev-parse HEAD)/' Makefile
165163
sed -i 's|^#: .*Doc/|#: |' *.po */*.po
166164
powrap -m
167-
@printf 'To add, you can use:\n git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done'
165+
@printf "\n%s %s\n" "Replace CPYTHON_CURRENT_COMMIT in Makefile by: " $(shell git -C $(CPYTHON_PATH) rev-parse HEAD)
166+
@printf 'To add, you can use:\n git status -s | grep "^ M .*\.po" | cut -d" " -f3 | while read -r file; do if [ $$(git diff "$$file" | wc -l) -gt 13 ]; then git add "$$file"; fi ; done\n'
168167

169168
.PHONY: clean
170169
clean:

‎c-api/decimal.po

+212
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,212 @@
1+
# SOME DESCRIPTIVE TITLE.
2+
# Copyright (C) 2001-2021, Python Software Foundation
3+
# This file is distributed under the same license as the Python package.
4+
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5+
#
6+
#, fuzzy
7+
msgid ""
8+
msgstr ""
9+
"Project-Id-Version: Python 3.10\n"
10+
"Report-Msgid-Bugs-To: \n"
11+
"POT-Creation-Date: 2021-03-18 17:40+0100\n"
12+
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13+
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14+
"Language-Team: LANGUAGE <[email protected]>\n"
15+
"MIME-Version: 1.0\n"
16+
"Content-Type: text/plain; charset=UTF-8\n"
17+
"Content-Transfer-Encoding: 8bit\n"
18+
19+
#: c-api/decimal.rst:7
20+
msgid "Decimal capsule API"
21+
msgstr ""
22+
23+
#: c-api/decimal.rst:9
24+
msgid ""
25+
"Capsule API functions can be used in the same manner as regular library "
26+
"functions, provided that the API has been initialized."
27+
msgstr ""
28+
29+
#: c-api/decimal.rst:14
30+
msgid "Initialize"
31+
msgstr ""
32+
33+
#: c-api/decimal.rst:16
34+
msgid ""
35+
"Typically, a C extension module that uses the decimal API will do these "
36+
"steps in its init function:"
37+
msgstr ""
38+
39+
#: c-api/decimal.rst:34
40+
msgid "Type checking, predicates, accessors"
41+
msgstr ""
42+
43+
#: c-api/decimal.rst:38
44+
msgid ""
45+
"Return 1 if ``dec`` is a Decimal, 0 otherwise. This function does not set "
46+
"any exceptions."
47+
msgstr ""
48+
49+
#: c-api/decimal.rst:44
50+
msgid "Return 1 if ``dec`` is ``NaN``, ``sNaN`` or ``Infinity``, 0 otherwise."
51+
msgstr ""
52+
53+
#: c-api/decimal.rst:55 c-api/decimal.rst:64
54+
msgid ""
55+
"Set TypeError and return -1 if ``dec`` is not a Decimal. It is guaranteed "
56+
"that this is the only failure mode, so if ``dec`` has already been type-"
57+
"checked, no errors can occur and the function can be treated as a simple "
58+
"predicate."
59+
msgstr ""
60+
61+
#: c-api/decimal.rst:53
62+
msgid "Return 1 if ``dec`` is ``NaN`` or ``sNaN``, 0 otherwise."
63+
msgstr ""
64+
65+
#: c-api/decimal.rst:62
66+
msgid "Return 1 if ``dec`` is ``Infinity``, 0 otherwise."
67+
msgstr ""
68+
69+
#: c-api/decimal.rst:71
70+
msgid ""
71+
"Return the number of digits in the coefficient. For ``Infinity``, the "
72+
"number of digits is always zero. Typically, the same applies to ``NaN`` and "
73+
"``sNaN``, but both of these can have a payload that is equivalent to a "
74+
"coefficient. Therefore, ``NaNs`` can have a nonzero return value."
75+
msgstr ""
76+
77+
#: c-api/decimal.rst:76
78+
msgid ""
79+
"Set TypeError and return -1 if ``dec`` is not a Decimal. It is guaranteed "
80+
"that this is the only failure mode, so if ``dec`` has already been type-"
81+
"checked, no errors can occur and the function can be treated as a simple "
82+
"accessor."
83+
msgstr ""
84+
85+
#: c-api/decimal.rst:82
86+
msgid "Exact conversions between decimals and primitive C types"
87+
msgstr ""
88+
89+
#: c-api/decimal.rst:84
90+
msgid ""
91+
"This API supports conversions for decimals with a coefficient up to 38 "
92+
"digits."
93+
msgstr ""
94+
95+
#: c-api/decimal.rst:87
96+
msgid "Data structures"
97+
msgstr ""
98+
99+
#: c-api/decimal.rst:89
100+
msgid ""
101+
"The conversion functions use the following status codes and data structures:"
102+
msgstr ""
103+
104+
#: c-api/decimal.rst:110
105+
msgid ""
106+
"The status cases are explained below. ``sign`` is 0 for positive and 1 for "
107+
"negative. ``((uint128_t)hi << 64) + lo`` is the coefficient, ``exp`` is the "
108+
"exponent."
109+
msgstr ""
110+
111+
#: c-api/decimal.rst:113
112+
msgid ""
113+
"The data structure is called \"triple\" because the decimal triple (sign, "
114+
"coeff, exp) is an established term and (``hi``, ``lo``) represents a single "
115+
"``uint128_t`` coefficient."
116+
msgstr ""
117+
118+
#: c-api/decimal.rst:216
119+
msgid "Functions"
120+
msgstr ""
121+
122+
#: c-api/decimal.rst:122
123+
msgid ""
124+
"Convert a decimal to a triple. As above, it is guaranteed that the only "
125+
"Python failure mode is a TypeError, checks can be omitted if the type is "
126+
"known."
127+
msgstr ""
128+
129+
#: c-api/decimal.rst:126
130+
msgid ""
131+
"For simplicity, the usage of the function and all special cases are "
132+
"explained in code form and comments:"
133+
msgstr ""
134+
135+
#: c-api/decimal.rst:180
136+
msgid ""
137+
"Create a decimal from a triple. The following rules must be observed for "
138+
"initializing the triple:"
139+
msgstr ""
140+
141+
#: c-api/decimal.rst:183
142+
msgid "``triple.sign`` must always be 0 (for positive) or 1 (for negative)."
143+
msgstr ""
144+
145+
#: c-api/decimal.rst:185
146+
msgid ""
147+
"``MPD_TRIPLE_QNAN``: ``triple.exp`` must be 0. If ``triple.hi`` or ``triple."
148+
"lo`` are nonzero, create a ``NaN`` with a payload."
149+
msgstr ""
150+
151+
#: c-api/decimal.rst:188
152+
msgid ""
153+
"``MPD_TRIPLE_SNAN``: ``triple.exp`` must be 0. If ``triple.hi`` or ``triple."
154+
"lo`` are nonzero, create an ``sNaN`` with a payload."
155+
msgstr ""
156+
157+
#: c-api/decimal.rst:191
158+
msgid ""
159+
"``MPD_TRIPLE_INF``: ``triple.exp``, ``triple.hi`` and ``triple.lo`` must be "
160+
"zero."
161+
msgstr ""
162+
163+
#: c-api/decimal.rst:193
164+
msgid ""
165+
"``MPD_TRIPLE_NORMAL``: ``MPD_MIN_ETINY + 38 < triple.exp < MPD_MAX_EMAX - "
166+
"38``. ``triple.hi`` and ``triple.lo`` can be chosen freely."
167+
msgstr ""
168+
169+
#: c-api/decimal.rst:196
170+
msgid "``MPD_TRIPLE_ERROR``: It is always an error to set this tag."
171+
msgstr ""
172+
173+
#: c-api/decimal.rst:199
174+
msgid ""
175+
"If one of the above conditions is not met, the function returns ``NaN`` if "
176+
"the ``InvalidOperation`` trap is not set in the thread local context. "
177+
"Otherwise, it sets the ``InvalidOperation`` exception and returns NULL."
178+
msgstr ""
179+
180+
#: c-api/decimal.rst:203
181+
msgid ""
182+
"Additionally, though extremely unlikely give the small allocation sizes, the "
183+
"function can set ``MemoryError`` and return ``NULL``."
184+
msgstr ""
185+
186+
#: c-api/decimal.rst:208
187+
msgid "Advanced API"
188+
msgstr ""
189+
190+
#: c-api/decimal.rst:210
191+
msgid ""
192+
"This API enables the use of ``libmpdec`` functions. Since Python is "
193+
"compiled with hidden symbols, the API requires an external libmpdec and the "
194+
"``mpdecimal.h`` header."
195+
msgstr ""
196+
197+
#: c-api/decimal.rst:220
198+
msgid ""
199+
"Return a new decimal that can be used in the ``result`` position of "
200+
"``libmpdec`` functions."
201+
msgstr ""
202+
203+
#: c-api/decimal.rst:225
204+
msgid ""
205+
"Get a pointer to the internal ``mpd_t`` of the decimal. Decimals are "
206+
"immutable, so this function must only be used on a new Decimal that has been "
207+
"created by PyDec_Alloc()."
208+
msgstr ""
209+
210+
#: c-api/decimal.rst:231
211+
msgid "Get a pointer to the constant internal ``mpd_t`` of the decimal."
212+
msgstr ""

‎c-api/file.po

+2-2
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-12-17 16:05+0100\n"
8+
"POT-Creation-Date: 2021-03-19 16:59+0100\n"
99
"PO-Revision-Date: 2018-10-18 09:48+0200\n"
1010
"Last-Translator: \n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -149,7 +149,7 @@ msgstr ""
149149
msgid "This function is safe to call before :c:func:`Py_Initialize`."
150150
msgstr ""
151151

152-
#: c-api/file.rst:86
152+
#: c-api/file.rst:85
153153
msgid ""
154154
"Raises an :ref:`auditing event <auditing>` ``setopencodehook`` with no "
155155
"arguments."

‎c-api/init.po

+2-2
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-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2021-03-19 16:59+0100\n"
99
"PO-Revision-Date: 2018-11-29 18:22+0100\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -472,7 +472,7 @@ msgid ""
472472
"than once."
473473
msgstr ""
474474

475-
#: c-api/init.rst:305
475+
#: c-api/init.rst:304
476476
msgid ""
477477
"Raises an :ref:`auditing event <auditing>` ``cpython."
478478
"_PySys_ClearAuditHooks`` with no arguments."

‎c-api/memory.po

+7-3
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-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2021-03-19 16:59+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"
@@ -750,8 +750,9 @@ msgid "allocate an arena of size bytes"
750750
msgstr ""
751751

752752
#: c-api/memory.rst:519
753-
msgid "``void free(void *ctx, size_t size, void *ptr)``"
754-
msgstr "``void free(void *ctx, size_t size, void *ptr)``"
753+
#, fuzzy
754+
msgid "``void free(void *ctx, void *ptr, size_t size)``"
755+
msgstr "``void free(void *ctx, void *ptr)``"
755756

756757
#: c-api/memory.rst:519
757758
msgid "free an arena"
@@ -830,3 +831,6 @@ msgid ""
830831
"These will be explained in the next chapter on defining and implementing new "
831832
"object types in C."
832833
msgstr ""
834+
835+
#~ msgid "``void free(void *ctx, size_t size, void *ptr)``"
836+
#~ msgstr "``void free(void *ctx, size_t size, void *ptr)``"

‎c-api/sys.po

+2-2
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-10-01 16:00+0200\n"
8+
"POT-Creation-Date: 2021-03-19 16:59+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"
@@ -426,7 +426,7 @@ msgid ""
426426
"events table <audit-events>`. Details are in each function's documentation."
427427
msgstr ""
428428

429-
#: c-api/sys.rst:None
429+
#: c-api/sys.rst:363
430430
msgid ""
431431
"Raises an :ref:`auditing event <auditing>` ``sys.addaudithook`` with no "
432432
"arguments."

0 commit comments

Comments
 (0)