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

Skip to content

Commit 0e3284c

Browse files
JulienPalardJulienPalard
authored
make merge (#1125)
1 parent 277aa2e commit 0e3284c

Some content is hidden

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

64 files changed

+4615
-4185
lines changed

‎Makefile

Lines changed: 2 additions & 1 deletion
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 := e21aa61e96f8343200e765d119ebe778873a6bf1
24+
CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20
2525

2626
CPYTHON_PATH := ../cpython/
2727

@@ -157,6 +157,7 @@ merge: setup
157157
sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile
158158
rm -fr $(WORKTREES)/$(BRANCH)
159159
git -C $(CPYTHON_PATH) worktree prune
160+
echo 'To add, you can use 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'
160161

161162
.PHONY: clean
162163
clean:

‎c-api/code.po

Lines changed: 2 additions & 2 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: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2020-02-04 10:00+0100\n"
99
"PO-Revision-Date: 2018-02-15 00:30+0100\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -67,7 +67,7 @@ msgstr ""
6767
#: ../Doc/c-api/code.rst:45
6868
msgid ""
6969
"Similar to :c:func:`PyCode_New`, but with an extra \"posonlyargcount\" for "
70-
"positonal-only arguments."
70+
"positional-only arguments."
7171
msgstr ""
7272

7373
#: ../Doc/c-api/code.rst:51

‎c-api/dict.po

Lines changed: 27 additions & 25 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: 2019-11-15 18:54+0100\n"
8+
"POT-Creation-Date: 2020-02-04 10:00+0100\n"
99
"PO-Revision-Date: 2018-07-03 11:36+0200\n"
1010
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1111
"Language-Team: FRENCH <[email protected]>\n"
@@ -69,65 +69,67 @@ msgstr ""
6969

7070
#: ../Doc/c-api/dict.rst:65
7171
msgid ""
72-
"Insert *value* into the dictionary *p* with a key of *key*. *key* must be :"
72+
"Insert *val* into the dictionary *p* with a key of *key*. *key* must be :"
7373
"term:`hashable`; if it isn't, :exc:`TypeError` will be raised. Return ``0`` "
74-
"on success or ``-1`` on failure."
74+
"on success or ``-1`` on failure. This function *does not* steal a reference "
75+
"to *val*."
7576
msgstr ""
7677

77-
#: ../Doc/c-api/dict.rst:74
78+
#: ../Doc/c-api/dict.rst:75
7879
msgid ""
79-
"Insert *value* into the dictionary *p* using *key* as a key. *key* should be "
80+
"Insert *val* into the dictionary *p* using *key* as a key. *key* should be "
8081
"a :c:type:`const char\\*`. The key object is created using "
81-
"``PyUnicode_FromString(key)``. Return ``0`` on success or ``-1`` on failure."
82+
"``PyUnicode_FromString(key)``. Return ``0`` on success or ``-1`` on "
83+
"failure. This function *does not* steal a reference to *val*."
8284
msgstr ""
8385

84-
#: ../Doc/c-api/dict.rst:82
86+
#: ../Doc/c-api/dict.rst:83
8587
msgid ""
8688
"Remove the entry in dictionary *p* with key *key*. *key* must be hashable; "
8789
"if it isn't, :exc:`TypeError` is raised. Return ``0`` on success or ``-1`` "
8890
"on failure."
8991
msgstr ""
9092

91-
#: ../Doc/c-api/dict.rst:89
93+
#: ../Doc/c-api/dict.rst:90
9294
msgid ""
9395
"Remove the entry in dictionary *p* which has a key specified by the string "
9496
"*key*. Return ``0`` on success or ``-1`` on failure."
9597
msgstr ""
9698

97-
#: ../Doc/c-api/dict.rst:95
99+
#: ../Doc/c-api/dict.rst:96
98100
msgid ""
99101
"Return the object from dictionary *p* which has a key *key*. Return "
100102
"``NULL`` if the key *key* is not present, but *without* setting an exception."
101103
msgstr ""
102104

103-
#: ../Doc/c-api/dict.rst:98
105+
#: ../Doc/c-api/dict.rst:99
104106
msgid ""
105107
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
106108
"`__eq__` methods will get suppressed. To get error reporting use :c:func:"
107109
"`PyDict_GetItemWithError()` instead."
108110
msgstr ""
109111

110-
#: ../Doc/c-api/dict.rst:105
112+
#: ../Doc/c-api/dict.rst:106
111113
msgid ""
112114
"Variant of :c:func:`PyDict_GetItem` that does not suppress exceptions. "
113115
"Return ``NULL`` **with** an exception set if an exception occurred. Return "
114116
"``NULL`` **without** an exception set if the key wasn't present."
115117
msgstr ""
116118

117-
#: ../Doc/c-api/dict.rst:113
119+
#: ../Doc/c-api/dict.rst:114
118120
msgid ""
119121
"This is the same as :c:func:`PyDict_GetItem`, but *key* is specified as a :c:"
120122
"type:`const char\\*`, rather than a :c:type:`PyObject\\*`."
121123
msgstr ""
122124

123-
#: ../Doc/c-api/dict.rst:116
125+
#: ../Doc/c-api/dict.rst:117
124126
msgid ""
125127
"Note that exceptions which occur while calling :meth:`__hash__` and :meth:"
126128
"`__eq__` methods and creating a temporary string object will get suppressed. "
127129
"To get error reporting use :c:func:`PyDict_GetItemWithError()` instead."
128130
msgstr ""
129131

130-
#: ../Doc/c-api/dict.rst:124
132+
#: ../Doc/c-api/dict.rst:125
131133
msgid ""
132134
"This is the same as the Python-level :meth:`dict.setdefault`. If present, "
133135
"it returns the value corresponding to *key* from the dictionary *p*. If the "
@@ -137,29 +139,29 @@ msgid ""
137139
"the insertion."
138140
msgstr ""
139141

140-
#: ../Doc/c-api/dict.rst:134
142+
#: ../Doc/c-api/dict.rst:135
141143
msgid ""
142144
"Return a :c:type:`PyListObject` containing all the items from the dictionary."
143145
msgstr ""
144146

145-
#: ../Doc/c-api/dict.rst:139
147+
#: ../Doc/c-api/dict.rst:140
146148
msgid ""
147149
"Return a :c:type:`PyListObject` containing all the keys from the dictionary."
148150
msgstr ""
149151

150-
#: ../Doc/c-api/dict.rst:144
152+
#: ../Doc/c-api/dict.rst:145
151153
msgid ""
152154
"Return a :c:type:`PyListObject` containing all the values from the "
153155
"dictionary *p*."
154156
msgstr ""
155157

156-
#: ../Doc/c-api/dict.rst:152
158+
#: ../Doc/c-api/dict.rst:153
157159
msgid ""
158160
"Return the number of items in the dictionary. This is equivalent to "
159161
"``len(p)`` on a dictionary."
160162
msgstr ""
161163

162-
#: ../Doc/c-api/dict.rst:158
164+
#: ../Doc/c-api/dict.rst:159
163165
msgid ""
164166
"Iterate over all key-value pairs in the dictionary *p*. The :c:type:"
165167
"`Py_ssize_t` referred to by *ppos* must be initialized to ``0`` prior to the "
@@ -173,18 +175,18 @@ msgid ""
173175
"structure is sparse, the offsets are not consecutive."
174176
msgstr ""
175177

176-
#: ../Doc/c-api/dict.rst:169
178+
#: ../Doc/c-api/dict.rst:170
177179
msgid "For example::"
178180
msgstr "Par exemple ::"
179181

180-
#: ../Doc/c-api/dict.rst:179
182+
#: ../Doc/c-api/dict.rst:180
181183
msgid ""
182184
"The dictionary *p* should not be mutated during iteration. It is safe to "
183185
"modify the values of the keys as you iterate over the dictionary, but only "
184186
"so long as the set of keys does not change. For example::"
185187
msgstr ""
186188

187-
#: ../Doc/c-api/dict.rst:204
189+
#: ../Doc/c-api/dict.rst:205
188190
msgid ""
189191
"Iterate over mapping object *b* adding key-value pairs to dictionary *a*. "
190192
"*b* may be a dictionary, or any object supporting :c:func:`PyMapping_Keys` "
@@ -194,7 +196,7 @@ msgid ""
194196
"or ``-1`` if an exception was raised."
195197
msgstr ""
196198

197-
#: ../Doc/c-api/dict.rst:214
199+
#: ../Doc/c-api/dict.rst:215
198200
msgid ""
199201
"This is the same as ``PyDict_Merge(a, b, 1)`` in C, and is similar to ``a."
200202
"update(b)`` in Python except that :c:func:`PyDict_Update` doesn't fall back "
@@ -203,7 +205,7 @@ msgid ""
203205
"exception was raised."
204206
msgstr ""
205207

206-
#: ../Doc/c-api/dict.rst:223
208+
#: ../Doc/c-api/dict.rst:224
207209
msgid ""
208210
"Update or merge into dictionary *a*, from the key-value pairs in *seq2*. "
209211
"*seq2* must be an iterable object producing iterable objects of length 2, "
@@ -212,6 +214,6 @@ msgid ""
212214
"if an exception was raised. Equivalent Python (except for the return value)::"
213215
msgstr ""
214216

215-
#: ../Doc/c-api/dict.rst:238
217+
#: ../Doc/c-api/dict.rst:239
216218
msgid "Clear the free list. Return the total number of freed items."
217219
msgstr ""

0 commit comments

Comments
 (0)