https://github.com/python/cpython/commit/d4a28ec89c4f3f527c368066f633d4a4bbfa46a7
commit: d4a28ec89c4f3f527c368066f633d4a4bbfa46a7
branch: 3.11
author: Ege Akman <[email protected]>
committer: hugovk <[email protected]>
date: 2024-01-03T15:05:54+02:00
summary:
[3.11] gh-113637: Let c_annotations.py to handle the spacing of
Limited/Unstable API & Stable ABI translation strings (#113638) (#113679)
files:
M Doc/tools/extensions/c_annotations.py
M Doc/tools/templates/dummy.html
M Misc/ACKS
diff --git a/Doc/tools/extensions/c_annotations.py
b/Doc/tools/extensions/c_annotations.py
index 26202228d8756e..453cdf22f6b1d1 100644
--- a/Doc/tools/extensions/c_annotations.py
+++ b/Doc/tools/extensions/c_annotations.py
@@ -126,7 +126,8 @@ def add_annotations(self, app, doctree):
f"Object type mismatch in limited API annotation "
f"for {name}: {record['role']!r} != {objtype!r}")
stable_added = record['added']
- message = sphinx_gettext(' Part of the ')
+ message = sphinx_gettext('Part of the')
+ message = message.center(len(message) + 2)
emph_node = nodes.emphasis(message, message,
classes=['stableabi'])
ref_node = addnodes.pending_xref(
@@ -139,20 +140,20 @@ def add_annotations(self, app, doctree):
ref_node += nodes.Text(sphinx_gettext('Stable ABI'))
emph_node += ref_node
if struct_abi_kind == 'opaque':
- emph_node += nodes.Text(sphinx_gettext(' (as an opaque
struct)'))
+ emph_node += nodes.Text(' ' + sphinx_gettext('(as an
opaque struct)'))
elif struct_abi_kind == 'full-abi':
- emph_node += nodes.Text(sphinx_gettext(' (including all
members)'))
+ emph_node += nodes.Text(' ' + sphinx_gettext('(including
all members)'))
if record['ifdef_note']:
emph_node += nodes.Text(' ' + record['ifdef_note'])
if stable_added == '3.2':
# Stable ABI was introduced in 3.2.
pass
else:
- emph_node += nodes.Text(sphinx_gettext(' since version
%s') % stable_added)
+ emph_node += nodes.Text(' ' + sphinx_gettext('since
version %s') % stable_added)
emph_node += nodes.Text('.')
if struct_abi_kind == 'members':
emph_node += nodes.Text(
- sphinx_gettext(' (Only some members are part of the
stable ABI.)'))
+ ' ' + sphinx_gettext('(Only some members are part of
the stable ABI.)'))
node.insert(0, emph_node)
# Return value annotation
diff --git a/Doc/tools/templates/dummy.html b/Doc/tools/templates/dummy.html
index 4cbc75cb66d1ba..8a278c2e35aea3 100644
--- a/Doc/tools/templates/dummy.html
+++ b/Doc/tools/templates/dummy.html
@@ -9,13 +9,13 @@
In extensions/c_annotations.py:
-{% trans %} Part of the {% endtrans %}
+{% trans %}Part of the{% endtrans %}
{% trans %}Limited API{% endtrans %}
{% trans %}Stable ABI{% endtrans %}
-{% trans %} (as an opaque struct){% endtrans %}
-{% trans %} (including all members){% endtrans %}
-{% trans %} since version %s{% endtrans %}
-{% trans %} (Only some members are part of the stable ABI.){% endtrans %}
+{% trans %}(as an opaque struct){% endtrans %}
+{% trans %}(including all members){% endtrans %}
+{% trans %}since version %s{% endtrans %}
+{% trans %}(Only some members are part of the stable ABI.){% endtrans %}
{% trans %}Return value: Always NULL.{% endtrans %}
{% trans %}Return value: New reference.{% endtrans %}
{% trans %}Return value: Borrowed reference.{% endtrans %}
diff --git a/Misc/ACKS b/Misc/ACKS
index 7efa01db59e7ea..e7e4bb0a6db931 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -31,6 +31,7 @@ Farhan Ahmad
Matthew Ahrens
Nir Aides
Akira
+Ege Akman
Yaniv Aknin
Jyrki Alakuijala
Tatiana Al-Chueyr
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
