Merge branch '3.13' into tkinter

Author: mattwang44

.github/workflows/ci.yml

@@ -1,5 +1,11 @@
 name: build
 
+concurrency: preview-${{ github.ref }}
+
+permissions:
+  contents: write
+  pull-requests: write
+
 on:
   pull_request:
 
@@ -19,5 +25,20 @@ jobs:
       - name: Install uv
         uses: astral-sh/setup-uv@v6
 
-      - name: Validate
+      - name: Build HTML Docs
         run: VERSION=${{ github.event.repository.default_branch }} JOBS=4 MODE=html make all
+
+      - uses: actions/create-github-app-token@v2
+        id: app-token
+        with:
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - name: Deploy PR Doc Preview
+        uses: rossjrw/pr-preview-action@v1
+        with:
+          source-dir: ../cpython/Doc/build/html
+          token: ${{ steps.app-token.outputs.token }}
+          preview-branch: gh-pages
+          umbrella-dir: pr-preview
+          action: auto

.github/workflows/deploy-gh-page.yml

@@ -23,7 +23,8 @@ jobs:
       - name: Deploy to gh page
         uses: JamesIves/[email protected]
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages
-          FOLDER: ../cpython/Doc/build/html
-          CLEAN: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: gh-pages
+          folder: ../cpython/Doc/build/html
+          clean: true
+          clean-exclude: pr-preview/

.github/workflows/py313-sync-cpython.yml

@@ -36,17 +36,17 @@ jobs:
       - name: Sync with CPython
         run: make clone merge rm_cpython wrap
 
-      - uses: tibdex/github-app-token@v2
-        id: generate-token
+      - uses: actions/create-github-app-token@v2
+        id: app-token
         with:
-          app_id: ${{ secrets.APP_ID }}
-          private_key: ${{ secrets.APP_PRIVATE_KEY }}
+          app-id: ${{ secrets.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
       - name: Create Pull Request
         id: cpr
         uses: peter-evans/create-pull-request@v6
         with:
-          token: ${{ steps.generate-token.outputs.token }}
+          token: ${{ steps.app-token.outputs.token }}
           commit-message: sync with cpython ${{ env.LATEST_COMMIT_ID }}
           committer: GitHub <[email protected]>
           author: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.scripts/README.md

@@ -2,16 +2,11 @@
 
 Useful scripts for the translation.
 
-## Translation Dictionary
-
-The repository includes terminology dictionaries (`terminology_dictionary.csv` and `focused_terminology_dictionary.csv`) that provide standard translations for important Python terms to maintain consistency across documents. These dictionaries are maintained using LLM knowledge and can be referenced by translators.
-
-See `TERMINOLOGY_DICTIONARY.md` for detailed usage and integration with translation workflow.
-
 ## From Google Translation
 
 Translate all untranslated entries of the given .po file with Google Translate.
 
+
 ```sh
 .scripts/google_translate.sh library/csv.po
 ```

.scripts/summarize_progress/main.py

@@ -6,27 +6,6 @@
 from pathlib import Path
 
 
-def entry_check(pofile: polib.POFile) -> str:
-    '''
-    Check the po file with how many entries are translated or not.
-    '''
-
-    lines_tranlated = len(pofile.translated_entries())
-    lines_untranlated = len(pofile.untranslated_entries())
-
-    if lines_tranlated == 0:
-        result = "❌"
-    elif lines_untranlated == 0:
-        result = "✅"
-    else:
-        lines_all = lines_tranlated + lines_untranlated
-        progress = lines_tranlated / lines_all
-        progress_percentage = round(progress * 100, 2)
-        result = f"{progress_percentage} %"
-
-    return result
-
-
 def get_open_issues_count() -> int:
     '''
     Fetch GitHub API to get the number of OPEN ISSUES.
@@ -89,21 +68,23 @@ def get_github_issues() -> list:
 
 
 def format_line_table_header() -> list:
-    return [f"|Filename|Progress|Issue|Assignee|\r\n",
+    return [f"|Filename|Progress (#string)|Issue|Assignee|\r\n",
             f"|-------:|:-------|:----|:-------|\r\n"]
 
 
-def format_issue_link(url: str) -> str:
-    return f"[{url.split('/')[-1]}]({url})" if len(url) > 0 else ''
-
-
-def format_line_file(dirname: str, filename: str, data: dict) -> str:
-    return f"|[`{filename}`](https://github.com/python/python-docs-zh-tw/tree/3.13/{dirname}/{filename})" + \
-    f"|{data['progress']}|{format_issue_link(data['issue'])}|{data['assignee']}|\r\n"
+def format_line_po_issue_display(issue_link: str, issue_number: str, progress: float, create_issue_link: str) -> str:
+    if issue_link:
+        return f"[{issue_number}]({issue_link})"
+    if progress != 100.:
+        return f"[create issue]({create_issue_link})"
+    return ""
 
 
-def format_line_directory(dirname: str) -> str:
-    return f"## {dirname}\r\n"
+def format_line_po(filename: str, po_link: str, progress: str, num_entries: str, issue_display: str, assignee: str) -> str:
+    progress_display = f"{progress} %"
+    if progress == 100:
+        progress_display = "✅"
+    return f"|[`{filename}`]({po_link})|{progress_display} ({num_entries:,})|{issue_display}|{assignee}|\r\n"
 
 
 if __name__ == "__main__":
@@ -118,11 +99,17 @@ def format_line_directory(dirname: str) -> str:
     for filepath in glob.glob(str(BASE_DIR / "**/*.po"), recursive=True):
         path = Path(filepath)
         filename = path.name
-        dirname = path.parent.name if path.parent.name != BASE_DIR.name else '/'
+        dirname = path.parent.name if path.parent.name != BASE_DIR.name else 'root'
         po = polib.pofile(filepath)
 
+        num_entries = len(list(filter(lambda e: not e.obsolete, po)))
+        num_translated = len(po.translated_entries())
         summary.setdefault(dirname, {})[filename] = {
-            'progress': entry_check(po),
+            'po_info': {
+                'num_entries': num_entries,
+                'num_translated': num_translated,
+                'progress': round(num_translated / num_entries * 100, 2),
+            },
             'issue': '',
             'assignee': '',
         }
@@ -138,25 +125,47 @@ def format_line_directory(dirname: str) -> str:
             pass
 
     '''
-    Adding Space for Formatting Markdown Link
-    '''
-
-    '''
-    Format the lines that will write into the markdown file,
+    Format the lines that will be written into the markdown file,
     also sort the directory name and file name.
     '''
     writeliner = []
     summary_sorted = dict(sorted(summary.items()))
+    total_entries, total_translated = 0, 0
     for dirname, filedict in summary_sorted.items():
-        writeliner.append(format_line_directory(dirname))
-        writeliner.extend(format_line_table_header())
-
+        dir_total_entries, dir_total_translated = 0, 0
+        lines = []
         filedict_sorted = dict(sorted(filedict.items()))
         for filename, filedata in filedict_sorted.items():
-            writeliner.append(format_line_file(dirname, filename, filedata))
+            file_path = f"{dirname}/{filename}" if dirname else filename
+            po_link = f"https://github.com/python/python-docs-zh-tw/tree/3.13/{file_path}"
+            issue_link = filedata['issue']
+            issue_number = f"#{issue_link.split('/')[-1]}"
+            create_issue_link = f"https://github.com/python/python-docs-zh-tw/issues/new?title=Translate%20`{file_path}`"
+            issue_display = format_line_po_issue_display(issue_link, issue_number, filedata['po_info']['progress'], create_issue_link)
+            line_po = format_line_po(
+                filename,
+                po_link,
+                filedata['po_info']['progress'],
+                filedata['po_info']['num_entries'],
+                issue_display,
+                filedata['assignee'],
+            )
+            lines.append(line_po)
+
+            dir_total_entries += filedata['po_info']['num_entries']
+            dir_total_translated += filedata['po_info']['num_translated']
+
+        dir_progress = round(dir_total_translated / dir_total_entries * 100, 2)
+        writeliner.append(f"## {dirname} ({dir_progress}%)\r\n")
+        writeliner.extend(format_line_table_header())
+        writeliner.extend(lines)
+
+        total_entries += dir_total_entries
+        total_translated += dir_total_translated
+
+    overall_progress = round(total_translated / total_entries * 100, 2)
+    title = f"## Overall Progress: {overall_progress}% ({total_translated:,} / {total_entries:,})\r\n"
+    writeliner = [title] + writeliner
 
-    with open(
-        f"summarize_progress/result.md",
-        "w",
-    ) as file:
+    with open(f"summarize_progress/result.md", "w") as file:
         file.writelines(writeliner)

c-api/allocation.po

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2024, Python Software Foundation
+# Copyright (C) 2001-2025, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
@@ -62,6 +62,8 @@ msgid ""
 "`Py_TPFLAGS_HAVE_GC` set. For such objects, use :c:func:`PyObject_GC_New` "
 "instead."
 msgstr ""
+"注意，如果 *typeobj* 有 :c:macro:`Py_TPFLAGS_HAVE_GC` 設定，則此函式不適用。"
+"對於這種物件，請改用 :c:func:`PyObject_GC_New`。"
 
 #: ../../c-api/allocation.rst:45
 msgid ""
@@ -88,6 +90,8 @@ msgid ""
 "`Py_TPFLAGS_HAVE_GC` set. For such objects, use :c:func:`PyObject_GC_NewVar` "
 "instead."
 msgstr ""
+"注意，如果 *typeobj* 有 :c:macro:`Py_TPFLAGS_HAVE_GC` 設定，則此函式不適用。"
+"對於這種物件，請改用 :c:func:`PyObject_GC_NewVar`。"
 
 #: ../../c-api/allocation.rst:63
 msgid ""

c-api/bool.po

@@ -1,5 +1,4 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) 2001-2022, Python Software Foundation
+# Copyright (C) 2001-2025, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
@@ -42,6 +41,8 @@ msgid ""
 "This instance of :c:type:`PyTypeObject` represents the Python boolean type; "
 "it is the same object as :class:`bool` in the Python layer."
 msgstr ""
+"此 :c:type:`PyTypeObject` 實例代表 Python 的布林型別；它與 Python 層級中的 "
+":class:`bool` 是同一個物件。"
 
 #: ../../c-api/bool.rst:22
 msgid ""

c-api/call.po

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2023, Python Software Foundation
+# Copyright (C) 2001-2025, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
@@ -122,6 +122,11 @@ msgid ""
 "versions, vectorcall should only be used with :c:macro:`immutable "
 "<Py_TPFLAGS_IMMUTABLETYPE>` or static types."
 msgstr ""
+"當一個類別的 :py:meth:`~object.__call__` 方法被重新賦值時，:c:macro:"
+"`Py_TPFLAGS_HAVE_VECTORCALL` 旗標現在會被移除。（這會在內部設定 :c:member:"
+"`~PyTypeObject.tp_call`，因此可能會使它與 vectorcall 函式有不同的行為。）"
+"在較早的 Python 版本中，vectorcall 應該只與 :c:macro:"
+"`immutable <Py_TPFLAGS_IMMUTABLETYPE>` 或靜態型別一起使用。"
 
 #: ../../c-api/call.rst:69
 msgid ""

c-api/hash.po

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2024, Python Software Foundation
+# Copyright (C) 2001-2025, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
@@ -39,22 +39,24 @@ msgid ""
 "The `Mersenne prime <https://en.wikipedia.org/wiki/Mersenne_prime>`_ ``P = "
 "2**n -1``, used for numeric hash scheme."
 msgstr ""
+"用於數值雜湊方案的\\ `梅森質數 (Mersenne prime) <https://en.wikipedia.org/"
+"wiki/Mersenne_prime>`_ ``P = 2**n -1``。"
 
 #: ../../c-api/hash.rst:28
 msgid "The exponent ``n`` of ``P`` in :c:macro:`PyHASH_MODULUS`."
-msgstr ""
+msgstr ":c:macro:`PyHASH_MODULUS` 中 ``P`` 的指數 ``n``。"
 
 #: ../../c-api/hash.rst:34
 msgid "Prime multiplier used in string and various other hashes."
-msgstr ""
+msgstr "用於字串和其他各種雜湊的質數乘數 (prime multiplier)。"
 
 #: ../../c-api/hash.rst:40
 msgid "The hash value returned for a positive infinity."
-msgstr ""
+msgstr "正無窮大回傳的雜湊值。"
 
 #: ../../c-api/hash.rst:46
 msgid "The multiplier used for the imaginary part of a complex number."
-msgstr ""
+msgstr "用於複數虛數部分的乘數。"
 
 #: ../../c-api/hash.rst:52
 msgid "Hash function definition used by :c:func:`PyHash_GetFuncDef`."
@@ -87,17 +89,21 @@ msgid ""
 "Hash a pointer value: process the pointer value as an integer (cast it to "
 "``uintptr_t`` internally). The pointer is not dereferenced."
 msgstr ""
+"雜湊指標值：將指標值作為整數處理（在內部轉型為 ``uintptr_t``）。指標不會被取"
+"值 (dereference)。"
 
 #: ../../c-api/hash.rst:88
 msgid "The function cannot fail: it cannot return ``-1``."
-msgstr ""
+msgstr "此函式不會失敗：它不會回傳 ``-1``。"
 
 #: ../../c-api/hash.rst:94
 msgid ""
 "Generic hashing function that is meant to be put into a type object's "
 "``tp_hash`` slot. Its result only depends on the object's identity."
 msgstr ""
+"泛用雜湊函式，旨在放入型別物件的 ``tp_hash`` 插槽中。其結果僅取決於物件的識別"
+"性。"
 
 #: ../../c-api/hash.rst:99
 msgid "In CPython, it is equivalent to :c:func:`Py_HashPointer`."
-msgstr ""
+msgstr "在 CPython 中，它等價於 :c:func:`Py_HashPointer`。"

c-api/iter.po

@@ -1,4 +1,4 @@
-# Copyright (C) 2001-2023, Python Software Foundation
+# Copyright (C) 2001-2025, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
@@ -87,6 +87,28 @@ msgid ""
 "    /* continue doing useful work */\n"
 "}"
 msgstr ""
+"PyObject *iterator = PyObject_GetIter(obj);\n"
+"PyObject *item;\n"
+"\n"
+"if (iterator == NULL) {\n"
+"    /* 傳播錯誤 */\n"
+"}\n"
+"\n"
+"while ((item = PyIter_Next(iterator))) {\n"
+"    /* 對 item 做些事情 */\n"
+"    ...\n"
+"    /* 完成後釋放參照 */\n"
+"    Py_DECREF(item);\n"
+"}\n"
+"\n"
+"Py_DECREF(iterator);\n"
+"\n"
+"if (PyErr_Occurred()) {\n"
+"    /* 傳播錯誤 */\n"
+"}\n"
+"else {\n"
+"    /* 繼續做一些有用的任務 */\n"
+"}"
 
 #: ../../c-api/iter.rst:59
 msgid ""