Skip to content

Sync with CPython 3.11 #442

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
merged 13 commits into from
Jul 18, 2023
Merged

Sync with CPython 3.11 #442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2620c59
sync with cpython e0d951d6
github-actions[bot] Jul 3, 2023
867e64a
sync with cpython ada22db1
github-actions[bot] Jul 6, 2023
64855d5
sync with cpython 80117dd4
github-actions[bot] Jul 6, 2023
bb976f4
sync with cpython 2d037fb4
github-actions[bot] Jul 9, 2023
f6f252b
sync with cpython dd046973
github-actions[bot] Jul 10, 2023
6ae20f1
sync with cpython 247f0500
github-actions[bot] Jul 12, 2023
4ffdf02
sync with cpython a276ce45
github-actions[bot] Jul 13, 2023
71f6992
sync with cpython 21862121
github-actions[bot] Jul 15, 2023
97f6ea0
sync with cpython c73f9c04
github-actions[bot] Jul 16, 2023
5b9da9c
sync with cpython a7acc5cb
github-actions[bot] Jul 18, 2023
11fc9b1
sync with cpython 38553442
github-actions[bot] Jul 18, 2023
6a3bb0e
fix: resolve fuzzy entries
mattwang44 Jul 18, 2023
4f4d053
Merge branch '3.11' into cron/sync/3.11
mattwang44 Jul 18, 2023
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
590 changes: 294 additions & 296 deletions howto/clinic.po
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 8 additions & 4 deletions library/asyncio-exceptions.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.11\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-10-15 20:43+0000\n"
"POT-Creation-Date: 2023-07-06 00:19+0000\n"
"PO-Revision-Date: 2022-01-31 21:41+0800\n"
"Last-Translator: Matt Wang <[email protected]>\n"
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
Expand All @@ -32,7 +32,9 @@ msgstr "**原始碼：**\\ :source:`Lib/asyncio/exceptions.py`"
msgid ""
"A deprecated alias of :exc:`TimeoutError`, raised when the operation has "
"exceeded the given deadline."
msgstr ":exc:`TimeoutError` 的一個已被棄用的別名，當操作已超過規定的截止時間時被引發。"
msgstr ""
":exc:`TimeoutError` 的一個已被棄用的別名，當操作已超過規定的截止時間時被引"
"發。"

#: ../../library/asyncio-exceptions.rst:21
msgid "This class was made an alias of :exc:`TimeoutError`."
Expand All @@ -51,8 +53,10 @@ msgstr ""
"該例外必須重新被引發。"

#: ../../library/asyncio-exceptions.rst:34
msgid ":exc:`CancelledError` is now a subclass of :class:`BaseException`."
msgstr ":exc:`CancelledError` 現在是 :class:`BaseException` 的子類別。"
msgid ""
":exc:`CancelledError` is now a subclass of :class:`BaseException` rather "
"than :class:`Exception`."
msgstr ":exc:`CancelledError` 現在是 :class:`BaseException` 而非 :class:`Exception` 的子類別。"

#: ../../library/asyncio-exceptions.rst:39
msgid "Invalid internal state of :class:`Task` or :class:`Future`."
Expand Down
65 changes: 33 additions & 32 deletions library/crypt.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.11\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-05-09 00:15+0000\n"
"POT-Creation-Date: 2023-07-13 00:19+0000\n"
"PO-Revision-Date: 2018-05-23 14:42+0000\n"
"Last-Translator: Adrian Liaw <[email protected]>\n"
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
Expand All @@ -26,14 +26,15 @@ msgstr ":mod:`crypt` --- 用於檢查 Unix 密碼的函式"
msgid "**Source code:** :source:`Lib/crypt.py`"
msgstr "**原始碼：**\\ :source:`Lib/crypt.py`"

#: ../../library/crypt.rst:23
#: ../../library/crypt.rst:24
msgid ""
"The :mod:`crypt` module is deprecated (see :pep:`PEP 594 <594#crypt>` for "
"details and alternatives). The :mod:`hashlib` module is a potential "
"replacement for certain use cases."
"replacement for certain use cases. The `passlib <https://pypi.org/project/"
"passlib/>`_ package can replace all use cases of this module."
msgstr ""

#: ../../library/crypt.rst:26
#: ../../library/crypt.rst:27
msgid ""
"This module implements an interface to the :manpage:`crypt(3)` routine, "
"which is a one-way hash function based upon a modified DES algorithm; see "
Expand All @@ -42,15 +43,15 @@ msgid ""
"attempting to crack Unix passwords with a dictionary."
msgstr ""

#: ../../library/crypt.rst:34
#: ../../library/crypt.rst:35
msgid ""
"Notice that the behavior of this module depends on the actual "
"implementation of the :manpage:`crypt(3)` routine in the running system. "
"Therefore, any extensions available on the current implementation will also "
"be available on this module."
msgstr ""

#: ../../library/crypt.rst:39
#: ../../library/crypt.rst:40
msgid ":ref:`Availability <availability>`: Unix, not VxWorks."
msgstr ":ref:`適用 <availability>`：Unix，非 VxWorks。"

Expand All @@ -65,65 +66,65 @@ msgid ""
"more information."
msgstr ""

#: ../../library/crypt.rst:44
#: ../../library/crypt.rst:45
msgid "Hashing Methods"
msgstr ""

#: ../../library/crypt.rst:48
#: ../../library/crypt.rst:49
msgid ""
"The :mod:`crypt` module defines the list of hashing methods (not all methods "
"are available on all platforms):"
msgstr ""

#: ../../library/crypt.rst:53
#: ../../library/crypt.rst:54
msgid ""
"A Modular Crypt Format method with 16 character salt and 86 character hash "
"based on the SHA-512 hash function. This is the strongest method."
msgstr ""

#: ../../library/crypt.rst:58
#: ../../library/crypt.rst:59
msgid ""
"Another Modular Crypt Format method with 16 character salt and 43 character "
"hash based on the SHA-256 hash function."
msgstr ""

#: ../../library/crypt.rst:63
#: ../../library/crypt.rst:64
msgid ""
"Another Modular Crypt Format method with 22 character salt and 31 character "
"hash based on the Blowfish cipher."
msgstr ""

#: ../../library/crypt.rst:70
#: ../../library/crypt.rst:71
msgid ""
"Another Modular Crypt Format method with 8 character salt and 22 character "
"hash based on the MD5 hash function."
msgstr ""

#: ../../library/crypt.rst:75
#: ../../library/crypt.rst:76
msgid ""
"The traditional method with a 2 character salt and 13 characters of hash. "
"This is the weakest method."
msgstr ""

#: ../../library/crypt.rst:80
#: ../../library/crypt.rst:81
msgid "Module Attributes"
msgstr "模組屬性"

#: ../../library/crypt.rst:86
#: ../../library/crypt.rst:87
msgid ""
"A list of available password hashing algorithms, as ``crypt.METHOD_*`` "
"objects. This list is sorted from strongest to weakest."
msgstr ""

#: ../../library/crypt.rst:92
#: ../../library/crypt.rst:93
msgid "Module Functions"
msgstr "模組函式"

#: ../../library/crypt.rst:94
#: ../../library/crypt.rst:95
msgid "The :mod:`crypt` module defines the following functions:"
msgstr ":mod:`crypt` 模組定義了以下函式："

#: ../../library/crypt.rst:98
#: ../../library/crypt.rst:99
msgid ""
"*word* will usually be a user's password as typed at a prompt or in a "
"graphical interface. The optional *salt* is either a string as returned "
Expand All @@ -133,14 +134,14 @@ msgid ""
"strongest method available in :attr:`methods` will be used."
msgstr ""

#: ../../library/crypt.rst:105
#: ../../library/crypt.rst:106
msgid ""
"Checking a password is usually done by passing the plain-text password as "
"*word* and the full results of a previous :func:`crypt` call, which should "
"be the same as the results of this call."
msgstr ""

#: ../../library/crypt.rst:109
#: ../../library/crypt.rst:110
msgid ""
"*salt* (either a random 2 or 16 character string, possibly prefixed with "
"``$digit$`` to indicate the method) which will be used to perturb the "
Expand All @@ -149,36 +150,36 @@ msgid ""
"``$digit$``."
msgstr ""

#: ../../library/crypt.rst:115
#: ../../library/crypt.rst:116
msgid ""
"Returns the hashed password as a string, which will be composed of "
"characters from the same alphabet as the salt."
msgstr ""

#: ../../library/crypt.rst:120
#: ../../library/crypt.rst:121
msgid ""
"Since a few :manpage:`crypt(3)` extensions allow different values, with "
"different sizes in the *salt*, it is recommended to use the full crypted "
"password as salt when checking for a password."
msgstr ""

#: ../../library/crypt.rst:124
#: ../../library/crypt.rst:125
msgid "Accept ``crypt.METHOD_*`` values in addition to strings for *salt*."
msgstr ""

#: ../../library/crypt.rst:130
#: ../../library/crypt.rst:131
msgid ""
"Return a randomly generated salt of the specified method. If no *method* is "
"given, the strongest method available in :attr:`methods` is used."
msgstr ""

#: ../../library/crypt.rst:134
#: ../../library/crypt.rst:135
msgid ""
"The return value is a string suitable for passing as the *salt* argument to :"
"func:`crypt`."
msgstr ""

#: ../../library/crypt.rst:137
#: ../../library/crypt.rst:138
msgid ""
"*rounds* specifies the number of rounds for ``METHOD_SHA256``, "
"``METHOD_SHA512`` and ``METHOD_BLOWFISH``. For ``METHOD_SHA256`` and "
Expand All @@ -188,29 +189,29 @@ msgid ""
"sup:`31`), the default is ``4096`` (2\\ :sup:`12`)."
msgstr ""

#: ../../library/crypt.rst:147
#: ../../library/crypt.rst:148
msgid "Added the *rounds* parameter."
msgstr "新增 *rounds* 參數。"

#: ../../library/crypt.rst:152
#: ../../library/crypt.rst:153
msgid "Examples"
msgstr "範例"

#: ../../library/crypt.rst:154
#: ../../library/crypt.rst:155
msgid ""
"A simple example illustrating typical use (a constant-time comparison "
"operation is needed to limit exposure to timing attacks. :func:`hmac."
"compare_digest` is suitable for this purpose)::"
msgstr ""

#: ../../library/crypt.rst:174
#: ../../library/crypt.rst:175
msgid ""
"To generate a hash of a password using the strongest available method and "
"check it against the original::"
msgstr ""

#: ../../library/crypt.rst:15 ../../library/crypt.rst:32
#: ../../library/crypt.rst:118
#: ../../library/crypt.rst:15 ../../library/crypt.rst:33
#: ../../library/crypt.rst:119
msgid "crypt(3)"
msgstr "crypt(3)"

Expand Down
Loading