Merge 3.14 into 3.12

github-actions · github-actions · commit 40664cde666a · 2026-01-25T23:51:33.000Z
diff --git a/library/faulthandler.po b/library/faulthandler.po
@@ -127,7 +127,7 @@ msgstr ""
 
 #: ../../library/faulthandler.rst:49
 msgid "Module :mod:`pdb`"
-msgstr ""
+msgstr ":mod:`pdb` モジュール"
 
 #: ../../library/faulthandler.rst:50
 msgid "Interactive source code debugger for Python programs."
diff --git a/library/hashlib.po b/library/hashlib.po
@@ -63,6 +63,14 @@ msgid ""
 "using the :meth:`digest()<hash.digest>` or :meth:`hexdigest()<hash."
 "hexdigest>` methods."
 msgstr ""
+"各 :dfn:`hash` の名前が付いたコンストラクタがあります。いずれも同一で簡単なイ"
+"ンターフェイスのあるハッシュオブジェクトを返します。例えば、SHA-256 ハッシュ"
+"オブジェクトを作るには :func:`sha256` を使います。このオブジェクトには :meth:"
+"`update<hash.update>` メソッドを用いて :term:`bytes-like オブジェクト <bytes-"
+"like object>` (通常 :class:`bytes`) を渡すことができます。:meth:"
+"`digest()<hash.digest>` や :meth:`hexdigest()<hash.hexdigest>` メソッドを用い"
+"て、それまでに渡したデータを連結したものの :dfn:`digest` をいつでも要求するこ"
+"とができます。"
 
 #: ../../library/hashlib.rst:48
 msgid ""
@@ -133,6 +141,8 @@ msgid ""
 "To obtain the digest of the byte string ``b\"Nobody inspects the spammish "
 "repetition\"``::"
 msgstr ""
+"``b\"Nobody inspects the spammish repetition\"``というバイト文字列のダイジェ"
+"ストを取得するには次のようにします::"
 
 #: ../../library/hashlib.rst:103
 msgid ""
@@ -154,7 +164,7 @@ msgstr "もっと簡潔に書くと、このようになります:"
 
 #: ../../library/hashlib.rst:118
 msgid "Constructors"
-msgstr ""
+msgstr "コンストラクタ"
 
 #: ../../library/hashlib.rst:122
 msgid ""
@@ -163,6 +173,9 @@ msgid ""
 "above listed hashes as well as any other algorithms that your OpenSSL "
 "library may offer."
 msgstr ""
+"一般的なコンストラクタで、第一引数にアルゴリズム名を文字列 *name* で受け取り"
+"ます。他にも、前述のハッシュアルゴリズムだけでなく OpenSSL ライブラリーが提供"
+"するような他のアルゴリズムにアクセスすることができます。"
 
 #: ../../library/hashlib.rst:127
 msgid "Using :func:`new` with an algorithm name:"
@@ -309,21 +322,26 @@ msgid ""
 "far. This is a bytes object of size *length* which may contain bytes in the "
 "whole range from 0 to 255."
 msgstr ""
+"これまで :meth:`~hash.update` メソッドに渡されたデータのダイジェスト値を返し"
+"ます。これは *length* と同じ長さの、0 から 255 の範囲全てを含み得るバイトの列"
+"です。"
 
 #: ../../library/hashlib.rst:250
 msgid ""
 "Like :meth:`digest` except the digest is returned as a string object of "
 "double length, containing only hexadecimal digits.  This may be used to "
 "exchange the value in email or other non-binary environments."
 msgstr ""
+":meth:`digest` と似ていますが、倍の長さの、16進形式文字列を返します。これは、"
+"電子メールなどの非バイナリ環境で値を交換する場合に便利です。"
 
 #: ../../library/hashlib.rst:254
 msgid "Example use:"
-msgstr ""
+msgstr "使用例:"
 
 #: ../../library/hashlib.rst:261
 msgid "File hashing"
-msgstr ""
+msgstr "ファイルのハッシュ化"
 
 #: ../../library/hashlib.rst:263
 msgid ""
@@ -424,6 +442,9 @@ msgid ""
 "then the digest size of the hash algorithm *hash_name* is used, e.g. 64 for "
 "SHA-512."
 msgstr ""
+"*dklen* は、導出されたバイト列の鍵の長さです。 *dklen* が ``None`` の場合、"
+"ハッシュアルゴリズム *hash_name* のダイジェストサイズが使われます。例えば "
+"SHA-512 では 64 です。"
 
 #: ../../library/hashlib.rst:345
 msgid "Function only available when Python is compiled with OpenSSL."
diff --git a/library/pdb.po b/library/pdb.po
@@ -87,15 +87,15 @@ msgstr ""
 
 #: ../../library/pdb.rst:41
 msgid "import pdb; pdb.set_trace()"
-msgstr ""
+msgstr "import pdb; pdb.set_trace()"
 
 #: ../../library/pdb.rst:43
 msgid "Or::"
-msgstr ""
+msgstr "もしくは::"
 
 #: ../../library/pdb.rst:45
 msgid "breakpoint()"
-msgstr ""
+msgstr "breakpoint()"
 
 #: ../../library/pdb.rst:47
 msgid ""
@@ -153,7 +153,7 @@ msgstr ""
 
 #: ../../library/pdb.rst:83
 msgid "python -m pdb [-c command] (-m module | -p pid | pyfile) [args ...]"
-msgstr ""
+msgstr "python -m pdb [-c command] (-m module | -p pid | pyfile) [args ...]"
 
 #: ../../library/pdb.rst:85
 msgid ""
@@ -177,7 +177,7 @@ msgstr ""
 
 #: ../../library/pdb.rst:96
 msgid "Added the ``-c`` option."
-msgstr ""
+msgstr "``-c`` オプションが追加されました。"
 
 #: ../../library/pdb.rst:101
 msgid ""
@@ -187,7 +187,7 @@ msgstr ""
 
 #: ../../library/pdb.rst:104
 msgid "Added the ``-m`` option."
-msgstr ""
+msgstr "``-m`` オプションが追加されました。"
 
 #: ../../library/pdb.rst:109
 msgid "Attach to the process with the specified PID."
@@ -201,7 +201,7 @@ msgstr ""
 
 #: ../../library/pdb.rst:117
 msgid "python -m pdb -p 1234"
-msgstr ""
+msgstr "python -m pdb -p 1234"
 
 #: ../../library/pdb.rst:121
 msgid ""
@@ -357,7 +357,7 @@ msgstr ""
 
 #: ../../library/pdb.rst:231
 msgid "Support for exception objects was added."
-msgstr ""
+msgstr "例外オブジェクトのサポートが追加されました。"
 
 #: ../../library/pdb.rst:236
 msgid ""
@@ -466,7 +466,7 @@ msgstr "*skip* を使ってトレースする呼び出しの例::"
 
 #: ../../library/pdb.rst:299
 msgid "import pdb; pdb.Pdb(skip=['django.*']).set_trace()"
-msgstr ""
+msgstr "import pdb; pdb.Pdb(skip=['django.*']).set_trace()"
 
 #: ../../library/pdb.rst:301
 msgid ""
@@ -489,15 +489,15 @@ msgstr "*readrc* 引数。"
 
 #: ../../library/pdb.rst:313
 msgid "Added the *mode* argument."
-msgstr ""
+msgstr "*mode* 引数が追加されました。"
 
 #: ../../library/pdb.rst:316
 msgid "Added the *backend* argument."
-msgstr ""
+msgstr "*backend* 引数が追加されました。"
 
 #: ../../library/pdb.rst:319
 msgid "Added the *colorize* argument."
-msgstr ""
+msgstr "*colorize* 引数が追加されました。"
 
 #: ../../library/pdb.rst:322
 msgid ""
diff --git a/library/secrets.po b/library/secrets.po
@@ -87,7 +87,7 @@ msgstr "[0, *exclusive_upper_bound*) の範囲のランダムな整数を返し
 
 #: ../../library/secrets.rst:55
 msgid "Return a non-negative int with *k* random bits."
-msgstr ""
+msgstr "ランダムな *k* ビットの非負の整数を返します。"
 
 #: ../../library/secrets.rst:59
 msgid "Generating tokens"
@@ -115,6 +115,8 @@ msgid ""
 ">>> token_bytes(16)\n"
 "b'\\xebr\\x17D*t\\xae\\xd4\\xe3S\\xb6\\xe2\\xebP1\\x8b'"
 msgstr ""
+">>> token_bytes(16)\n"
+"b'\\xebr\\x17D*t\\xae\\xd4\\xe3S\\xb6\\xe2\\xebP1\\x8b'"
 
 #: ../../library/secrets.rst:79
 msgid ""
@@ -131,6 +133,8 @@ msgid ""
 ">>> token_hex(16)\n"
 "'f9bf78b9a18ce6d46a0cd2b0b86df9da'"
 msgstr ""
+">>> token_hex(16)\n"
+"'f9bf78b9a18ce6d46a0cd2b0b86df9da'"
 
 #: ../../library/secrets.rst:90
 msgid ""
@@ -149,6 +153,8 @@ msgid ""
 ">>> token_urlsafe(16)\n"
 "'Drmhze6EPcv0fN_81Bj-nA'"
 msgstr ""
+">>> token_urlsafe(16)\n"
+"'Drmhze6EPcv0fN_81Bj-nA'"
 
 #: ../../library/secrets.rst:102
 msgid "How many bytes should tokens use?"
@@ -239,6 +245,10 @@ msgid ""
 "alphabet = string.ascii_letters + string.digits\n"
 "password = ''.join(secrets.choice(alphabet) for i in range(8))"
 msgstr ""
+"import string\n"
+"import secrets\n"
+"alphabet = string.ascii_letters + string.digits\n"
+"password = ''.join(secrets.choice(alphabet) for i in range(8))"
 
 #: ../../library/secrets.rst:157
 msgid ""
@@ -270,6 +280,15 @@ msgid ""
 "            and sum(c.isdigit() for c in password) >= 3):\n"
 "        break"
 msgstr ""
+"import string\n"
+"import secrets\n"
+"alphabet = string.ascii_letters + string.digits\n"
+"while True:\n"
+"    password = ''.join(secrets.choice(alphabet) for i in range(10))\n"
+"    if (any(c.islower() for c in password)\n"
+"            and any(c.isupper() for c in password)\n"
+"            and sum(c.isdigit() for c in password) >= 3):\n"
+"        break"
 
 #: ../../library/secrets.rst:180
 msgid "Generate an `XKCD-style passphrase <https://xkcd.com/936/>`_:"
@@ -298,3 +317,5 @@ msgid ""
 "import secrets\n"
 "url = 'https://example.com/reset=' + secrets.token_urlsafe()"
 msgstr ""
+"import secrets\n"
+"url = 'https://example.com/reset=' + secrets.token_urlsafe()"
diff --git a/library/timeit.po b/library/timeit.po
@@ -69,6 +69,12 @@ msgid ""
 "$ python -m timeit \"'-'.join(map(str, range(100)))\"\n"
 "10000 loops, best of 5: 23.2 usec per loop"
 msgstr ""
+"$ python -m timeit \"'-'.join(str(n) for n in range(100))\"\n"
+"10000 loops, best of 5: 30.2 usec per loop\n"
+"$ python -m timeit \"'-'.join([str(n) for n in range(100)])\"\n"
+"10000 loops, best of 5: 27.5 usec per loop\n"
+"$ python -m timeit \"'-'.join(map(str, range(100)))\"\n"
+"10000 loops, best of 5: 23.2 usec per loop"
 
 #: ../../library/timeit.rst:37
 msgid "This can be achieved from the :ref:`python-interface` with::"
@@ -84,6 +90,13 @@ msgid ""
 ">>> timeit.timeit('\"-\".join(map(str, range(100)))', number=10000)\n"
 "0.23702679807320237"
 msgstr ""
+">>> import timeit\n"
+">>> timeit.timeit('\"-\".join(str(n) for n in range(100))', number=10000)\n"
+"0.3018611848820001\n"
+">>> timeit.timeit('\"-\".join([str(n) for n in range(100)])', number=10000)\n"
+"0.2727368790656328\n"
+">>> timeit.timeit('\"-\".join(map(str, range(100)))', number=10000)\n"
+"0.23702679807320237"
 
 #: ../../library/timeit.rst:47
 msgid "A callable can also be passed from the :ref:`python-interface`::"
@@ -95,6 +108,8 @@ msgid ""
 ">>> timeit.timeit(lambda: \"-\".join(map(str, range(100))), number=10000)\n"
 "0.19665591977536678"
 msgstr ""
+">>> timeit.timeit(lambda: \"-\".join(map(str, range(100))), number=10000)\n"
+"0.19665591977536678"
 
 #: ../../library/timeit.rst:52
 msgid ""
@@ -244,7 +259,7 @@ msgstr ""
 
 #: ../../library/timeit.rst:143
 msgid "timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit()"
-msgstr ""
+msgstr "timeit.Timer('for i in range(10): oct(i)', 'gc.enable()').timeit()"
 
 #: ../../library/timeit.rst:148
 msgid "Automatically determine how many times to call :meth:`.timeit`."
@@ -345,6 +360,7 @@ msgstr "コマンドラインからプログラムとして呼び出す場合は
 msgid ""
 "python -m timeit [-n N] [-r N] [-u U] [-s S] [-p] [-v] [-h] [statement ...]"
 msgstr ""
+"python -m timeit [-n N] [-r N] [-u U] [-s S] [-p] [-v] [-h] [statement ...]"
 
 #: ../../library/timeit.rst:213
 msgid "Where the following options are understood:"
@@ -454,6 +470,12 @@ msgid ""
 "find(char)\"\n"
 "1000000 loops, best of 5: 0.342 usec per loop"
 msgstr ""
+"$ python -m timeit -s \"text = 'sample string'; char = 'g'\" \"char in "
+"text\"\n"
+"5000000 loops, best of 5: 0.0877 usec per loop\n"
+"$ python -m timeit -s \"text = 'sample string'; char = 'g'\" \"text."
+"find(char)\"\n"
+"1000000 loops, best of 5: 0.342 usec per loop"
 
 #: ../../library/timeit.rst:287
 msgid ""
@@ -479,6 +501,13 @@ msgid ""
 "\"g\"')\n"
 "1.7246671520006203"
 msgstr ""
+">>> import timeit\n"
+">>> timeit.timeit('char in text', setup='text = \"sample string\"; char = "
+"\"g\"')\n"
+"0.41440500499993504\n"
+">>> timeit.timeit('text.find(char)', setup='text = \"sample string\"; char = "
+"\"g\"')\n"
+"1.7246671520006203"
 
 #: ../../library/timeit.rst:302
 msgid "The same can be done using the :class:`Timer` class and its methods::"
@@ -496,6 +525,14 @@ msgid ""
 "[0.40183617287970225, 0.37027556854118704, 0.38344867356679524, "
 "0.3712595970846668, 0.37866875250654886]"
 msgstr ""
+">>> import timeit\n"
+">>> t = timeit.Timer('char in text', setup='text = \"sample string\"; char = "
+"\"g\"')\n"
+">>> t.timeit()\n"
+"0.3955516149999312\n"
+">>> t.repeat()\n"
+"[0.40183617287970225, 0.37027556854118704, 0.38344867356679524, "
+"0.3712595970846668, 0.37866875250654886]"
 
 #: ../../library/timeit.rst:312
 msgid ""
@@ -521,6 +558,17 @@ msgid ""
 "$ python -m timeit \"if hasattr(int, '__bool__'): pass\"\n"
 "100000 loops, best of 5: 2.23 usec per loop"
 msgstr ""
+"$ python -m timeit \"try:\" \"  str.__bool__\" \"except AttributeError:\" "
+"\"  pass\"\n"
+"20000 loops, best of 5: 15.7 usec per loop\n"
+"$ python -m timeit \"if hasattr(str, '__bool__'): pass\"\n"
+"50000 loops, best of 5: 4.26 usec per loop\n"
+"\n"
+"$ python -m timeit \"try:\" \"  int.__bool__\" \"except AttributeError:\" "
+"\"  pass\"\n"
+"200000 loops, best of 5: 1.43 usec per loop\n"
+"$ python -m timeit \"if hasattr(int, '__bool__'): pass\"\n"
+"100000 loops, best of 5: 2.23 usec per loop"
 
 #: ../../library/timeit.rst:330
 msgid ""
@@ -593,6 +641,15 @@ msgid ""
 "import timeit\n"
 "print(timeit.timeit('[func(42) for func in (f,g,h)]', globals=globals()))"
 msgstr ""
+"def f(x):\n"
+"    return x**2\n"
+"def g(x):\n"
+"    return x**4\n"
+"def h(x):\n"
+"    return x**8\n"
+"\n"
+"import timeit\n"
+"print(timeit.timeit('[func(42) for func in (f,g,h)]', globals=globals()))"
 
 #: ../../library/timeit.rst:9
 msgid "Benchmarking"
diff --git a/library/traceback.po b/library/traceback.po
diff --git a/whatsnew/3.14.po b/whatsnew/3.14.po
