Skip to content

make merge #1125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JulienPalard merged 1 commit into from
Feb 4, 2020
Merged

make merge #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
# from which we generated our po files. We use it here so when we
# test build, we're building with the .rst files that generated our
# .po files.
CPYTHON_CURRENT_COMMIT := e21aa61e96f8343200e765d119ebe778873a6bf1
CPYTHON_CURRENT_COMMIT := 83d3202b92fb4c2fc6df5b035d57f3a1cf715f20

CPYTHON_PATH := ../cpython/

Expand Down Expand Up @@ -157,6 +157,7 @@ merge: setup
sed -i 's/^CPYTHON_CURRENT_COMMIT :=.*/CPYTHON_CURRENT_COMMIT := $(shell git -C $(WORKTREES)/$(BRANCH) rev-parse HEAD)/' Makefile
rm -fr $(WORKTREES)/$(BRANCH)
git -C $(CPYTHON_PATH) worktree prune
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'

.PHONY: clean
clean:
Expand Down
4 changes: 2 additions & 2 deletions c-api/code.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"POT-Creation-Date: 2020-02-04 10:00+0100\n"
"PO-Revision-Date: 2018-02-15 00:30+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -67,7 +67,7 @@ msgstr ""
#: ../Doc/c-api/code.rst:45
msgid ""
"Similar to :c:func:`PyCode_New`, but with an extra \"posonlyargcount\" for "
"positonal-only arguments."
"positional-only arguments."
msgstr ""

#: ../Doc/c-api/code.rst:51
Expand Down
52 changes: 27 additions & 25 deletions c-api/dict.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-11-15 18:54+0100\n"
"POT-Creation-Date: 2020-02-04 10:00+0100\n"
"PO-Revision-Date: 2018-07-03 11:36+0200\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
Expand Down Expand Up @@ -69,65 +69,67 @@ msgstr ""

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

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

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

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

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

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

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

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

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

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

#: ../Doc/c-api/dict.rst:134
#: ../Doc/c-api/dict.rst:135
msgid ""
"Return a :c:type:`PyListObject` containing all the items from the dictionary."
msgstr ""

#: ../Doc/c-api/dict.rst:139
#: ../Doc/c-api/dict.rst:140
msgid ""
"Return a :c:type:`PyListObject` containing all the keys from the dictionary."
msgstr ""

#: ../Doc/c-api/dict.rst:144
#: ../Doc/c-api/dict.rst:145
msgid ""
"Return a :c:type:`PyListObject` containing all the values from the "
"dictionary *p*."
msgstr ""

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

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

#: ../Doc/c-api/dict.rst:169
#: ../Doc/c-api/dict.rst:170
msgid "For example::"
msgstr "Par exemple ::"

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

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

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

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

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