Skip to content

gh-133319: Use python versioning in msgfmt & pygettext #134205

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

Closed
wants to merge 3 commits into from
Closed

gh-133319: Use python versioning in msgfmt & pygettext #134205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5d1442f
Use pyver
StanFromIreland May 19, 2025
dd50012
Tests
StanFromIreland May 19, 2025
fe1b7f0
Add explanation
StanFromIreland May 28, 2025
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
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/ascii-escapes.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#. Special characters that are always escaped in the POT file
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/comments.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: comments.py:4
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/custom_keywords.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: custom_keywords.py:10 custom_keywords.py:11
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/docstrings.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: docstrings.py:1
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/escapes.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#. Special characters that are always escaped in the POT file
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/fileloc.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: fileloc.py:5 fileloc.py:6
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/messages.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: messages.py:16
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/i18n_data/multiple_keywords.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: pygettext.py 1.5\n"
"Generated-By: pygettext.py 3.15\n"


#: multiple_keywords.py:3
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_tools/test_msgfmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def test_version(self):
for option in ('--version', '-V'):
res = assert_python_ok(msgfmt_py, option)
out = res.out.decode('utf-8').strip()
self.assertEqual('msgfmt.py 1.2', out)
self.assertRegex(out, r'^msgfmt\.py \d+\.\d+$')

def test_invalid_option(self):
res = assert_python_failure(msgfmt_py, '--invalid-option')
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Tools-Demos/2025-05-19-10-41-00.gh-issue-133319.asgss.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use Python versioning in :program:`msgfmt` and :program:`pygettext`.
2 changes: 1 addition & 1 deletion Tools/i18n/msgfmt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from email.parser import HeaderParser
import codecs

__version__ = "1.2"
__version__ = "3.15"


MESSAGES = {}
Expand Down
5 changes: 3 additions & 2 deletions Tools/i18n/pygettext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@
from io import BytesIO
from operator import itemgetter

__version__ = '1.5'
# Update this to the current python version when modifying this script.
__version__ = '3.15'


# The normal pot-file header. msgmerge and Emacs's po-mode work better if it's
Expand Down Expand Up @@ -387,7 +388,7 @@ def unparse_spec(name, spec):
parts.append(f'{pos + 1}c')
else:
parts.append(str(pos + 1))
return f'{name}:{','.join(parts)}'
return f'{name}:{",".join(parts)}'


def process_keywords(keywords, *, no_default_keywords):
Expand Down
Loading